Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Mar 2012 02:21:06 +0000 (22:21 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Mar 2012 02:21:06 +0000 (22:21 -0400)
commitd05c03ab4ed23389b1326f9b7c77a8d7b8d6588d
treec402523f1548781a1437a1e409b0ca8c7ae7ebf4
parent9cf600e6dabe9133a0c25e87babc42e3a0e1a29a
parentb4f8c8f5f9ff0f8db6612d7f279976453b18876f
Merge branch '0.5.0.x' into 0.5.x
src/bitcoinrpc.cpp
src/util.h