Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 19:41:07 +0000 (15:41 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 19:41:07 +0000 (15:41 -0400)
commit658cf0b1be93e08eee400b0bd1e9d3485313475d
treeb36d3fbc1fa71d2c85486c09a1ed6a75de4f3e9f
parentef9ab3c2a0c5f2d8862e7315a01f9cfd7bee242d
parenta37092fcf427956e31d76aac6bd52e3e3459155f
Merge branch '0.5.0.x' into 0.5.x

Conflicts:
src/qt/bitcoingui.h
src/bitcoinrpc.cpp
src/qt/bitcoin.cpp
src/qt/bitcoingui.h