Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 14:53:14 +0000 (10:53 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 14:53:14 +0000 (10:53 -0400)
commitccfcdc2e3d51bf2d8ca6505db6434cea12050c43
tree65cdc0547a88978c7aa38cfceff762af99748d96
parent3eb5fdbf5f73535f6a027bbcdf07958610794749
parentc18b82d5db39bff026f10694a062be2dc7048fd8
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/protocol.h
src/serialize.h
src/main.h