Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 17 Jan 2012 03:30:10 +0000 (22:30 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 17 Jan 2012 03:30:10 +0000 (22:30 -0500)
1  2 
src/bitcoinrpc.cpp

Simple merge