Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 17 Feb 2012 14:40:00 +0000 (09:40 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 17 Feb 2012 14:40:00 +0000 (09:40 -0500)
commit6fb186f4bbeb34b4e5c22f909e8d0a1a877f1c44
treed1d195d7941297367db84da93c259034123c0a88
parentfb811c31fd28d1d637a50f784af620d085fa32d4
parentfdb365df0e9bf1b3073ea38212664cb59863bbd0
Merge branch '0.5.0.x' into 0.5.x
src/bitcoinrpc.cpp
src/util.h