From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 27 Apr 2012 17:57:43 +0000 (-0400)
Subject: Merge branch '0.5.x' into 0.6.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~5
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=655b1b0cc24ac4b1d6cbc131be48b0199c0c51ee

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	contrib/gitian-descriptors/gitian-win32.yml
---

655b1b0cc24ac4b1d6cbc131be48b0199c0c51ee