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

Simple merge