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

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
---

cd0527453b3be00b1cb91d6d6a53ff0d5d3029b4