Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 24 Jan 2012 03:45:36 +0000 (22:45 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 24 Jan 2012 03:45:36 +0000 (22:45 -0500)
commit8f378e98c5121f4f5c4936ef879f208f5f95bb5e
tree896b90556571e01e0a8fe3e7253787d5dbac917c
parent3d3f9cd120e3761aa14dcb1550d977b40fafdf8c
parent5df1a22c2e626a767a356265616f1f28e4346137
Merge branch '0.4.x' into 0.5.0.x

Conflicts:
doc/release-process.txt
src/net.cpp