Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 14 Jun 2012 18:07:11 +0000 (18:07 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 14 Jun 2012 18:07:11 +0000 (18:07 +0000)
commit3703150d56ff6ee557ab330e55637c9c23835902
treeb3f13dd5416c38c508ee785dd3e543e381cc03a2
parent1bc2f0a37b68aa99e90437105a48c47046b6c0d0
parentca39829ecb90e392b9722292739585124ba0d7c1
Merge branch '0.4.x' into 0.5.x

Conflicts:
doc/release-process.txt
src/serialize.h
.gitignore
doc/release-process.txt
src/main.h
src/net.cpp
src/serialize.h
src/util.cpp