Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 12 Feb 2012 02:26:11 +0000 (21:26 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 12 Feb 2012 02:26:11 +0000 (21:26 -0500)
1  2 
src/bitcoinrpc.cpp
src/net.cpp
src/net.h

Simple merge
diff --cc src/net.cpp
Simple merge
diff --cc src/net.h
Simple merge