Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Mar 2012 02:20:31 +0000 (22:20 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Mar 2012 02:20:31 +0000 (22:20 -0400)
1  2 
src/bitcoinrpc.cpp
src/util.h

Simple merge
diff --cc src/util.h
Simple merge