Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 20:28:00 +0000 (16:28 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 20:28:00 +0000 (16:28 -0400)
commit6c055e506d93ba3f6bf448f4633a774208be735c
tree3704c24126c2b0a89aebbd77cd7eff0f0cde7aa8
parent3a70f3a4ec0cc3860b977597577fcf01cd5c13ae
parent813dc92cdcdc575004d95627cdbdfb3cc87b87a5
Merge branch '0.5.x' into 0.6.0.x
src/bitcoinrpc.cpp