From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 5 Apr 2012 22:20:18 +0000 (-0400)
Subject: Merge branch '0.4.x' into 0.5.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~7^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=0af2f2d856e17854e7691ce4b09d9409deeb5dba

Merge branch '0.4.x' into 0.5.0.x
---

0af2f2d856e17854e7691ce4b09d9409deeb5dba