From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 8 May 2012 20:08:19 +0000 (+0000)
Subject: Merge branch '0.4.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2^2~9^2~1
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=fac3476993b4ae9b45b97c4967db9222243bea29;hp=b803009c84b1e7ca16cc5a2105269bc3518970a0;p=novacoin.git

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
---