Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:45:32 +0000 (16:45 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:45:32 +0000 (16:45 -0400)
commiteca170286ef79096b9005c28d0a6e1145b440f60
tree2f749271fc7631196a3bd6f46971e61170bdc1b0
parent7f23df06d7126e32bb2b80df355855bc9c8b242a
parent78b9d2de40144e6f420518bcdf62168855546ded
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/bitcoinrpc.cpp
src/qt/guiutil.h