From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 27 Mar 2012 00:06:55 +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~11^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=6085033f31456533ba874fa90aceebf871b0203c

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

6085033f31456533ba874fa90aceebf871b0203c