From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 12 Dec 2011 19:34:47 +0000 (-0500)
Subject: Merge branch '0.4.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~38^2~7
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=12c69167e367a2c7653af6a3c9565c7bde7c9f43

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

12c69167e367a2c7653af6a3c9565c7bde7c9f43