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)
commitb4f8c8f5f9ff0f8db6612d7f279976453b18876f
tree0335a682102647221898ef22d70edf6fb4532418
parentb3b4b008e39ed77e5c579fa0ca179fe785ee5e79
parent11c34e0f6cf9cb2715c28b85a1ec8f47bf5ca8dd
Merge branch '0.4.x' into 0.5.0.x
src/bitcoinrpc.cpp
src/util.h