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)
commit8ad6996cc38c7e5e21698db91759fcc3e8900545
tree2b3ef6daafbbbfdca0d461ebcccedb913e8aaa04
parentb5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07
parent888ac4e7a326986945ca91668c47a3d8fa981d49
Merge branch '0.4.x' into 0.5.0.x
src/bitcoinrpc.cpp
src/net.cpp
src/net.h