Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:22:24 +0000 (13:22 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:22:24 +0000 (13:22 -0400)
commit815a3605c1042b8ac2fa02b8e34041ab8611beed
treed71d9ae3604883dbd8810f6be9248ceb549aa037
parent1db5f43dc4d151a8b0543075385a57c3e57f54a3
parent17a5fd9248ce62ca412f7098ca261d4b4271cc99
Merge branch '0.5.0.x' into 0.5.x

Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
bitcoin-qt.pro
src/qt/bitcoingui.h