Luke Dashjr d31e24aeaa 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

2012-08-27 19:10:41 +00:00

1.1 KiB

Raw Blame History

View Raw