Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:10:20 +0000 (20:10 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:10:20 +0000 (20:10 +0000)
commitcd0527453b3be00b1cb91d6d6a53ff0d5d3029b4
treec9568edbf3600d5d59c8261499ce01c256946b68
parentb4813730015b9d5f5d2f0fbf17bdc45a642d4f9f
parent35a07f8ec4abbd0f6848e53a35b9520b33085c63
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