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)
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h

1  2 
src/bitcoinrpc.cpp
src/main.h

Simple merge
diff --cc src/main.h
Simple merge