Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:08:19 +0000 (20:08 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:08:19 +0000 (20:08 +0000)
commitfac3476993b4ae9b45b97c4967db9222243bea29
treeb205e2edec634cd9e5702369dbee4cb3b529f47a
parentb803009c84b1e7ca16cc5a2105269bc3518970a0
parent18b4eccddb7146522b18c5a6add113544a80df99
Merge branch '0.4.x' into 0.5.x

Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h