Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 19:43:29 +0000 (15:43 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 19:43:29 +0000 (15:43 -0400)
commitfe1725a141334dab82ca007fb6fc983c358e35b2
treed0c9729480297b1a4ee6a1565f07c2cbc18adfff
parent1376cd9d7f1d7df4395d5d686450bde44e260785
parent658cf0b1be93e08eee400b0bd1e9d3485313475d
Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/bitcoinrpc.cpp
contrib/gitian-downloader/linux-download-config
contrib/gitian-downloader/win32-download-config
src/bitcoinrpc.cpp
src/noui.h
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/bitcoingui.h
src/qtui.h