From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 19 Dec 2011 21:05:15 +0000 (-0500)
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~38^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=f503a1486a6cbda8d0e73923fec8de3ced253b28

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

f503a1486a6cbda8d0e73923fec8de3ced253b28