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)
1  2 
src/bitcoinrpc.cpp

Simple merge