Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 14:57:15 +0000 (10:57 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 14:57:15 +0000 (10:57 -0400)
commit8ba4282c3fd6dd26aa4956e5bc4a38c603625870
tree4d49a2b3a847ba8ef94ec2ae3cd5d0596ca04803
parentea22a380de824500644db6fd6f33d0465b34f7a1
parente5f43fe30992abd75b6f981fd287cfed64c627ee
Merge branch '0.5.x' into 0.6.0.x

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