Merge branch '0.5.3.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 22 Mar 2012 18:15:12 +0000 (14:15 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 22 Mar 2012 18:15:12 +0000 (14:15 -0400)
commit166004aca586292458fd6dd2c676e20f70d1e65d
treeab4f0d8fcf06924df896aa2b01e60eebd4caf226
parentd1eafe56c8f2e2912529a852bfd98b6e404560c9
parent1a4ac2b4d07eb9bf19d494586b0ff5c73ba2de68
Merge branch '0.5.3.x' into 0.5.x

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