Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 3 Jan 2012 17:19:48 +0000 (12:19 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 3 Jan 2012 17:19:48 +0000 (12:19 -0500)
commiteb2a10afd600b2680f24d02ffc73d4c9d9800492
tree90538703868e2b1c04c76c41b7368f2d04d4add8
parent3b8051864b98eb5a9df6327f314a45af9205a09c
parentcc6bd19660461091903568803014b39d571fd458
Merge branch '0.4.x' into 0.5.0.x

Conflicts:
src/util.cpp
src/init.cpp
src/net.cpp
src/util.cpp
src/util.h