From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 3 Jan 2012 17:23:09 +0000 (-0500)
Subject: Merge branch '0.5.0.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~34
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a2e9767225d3c3fa55f31c2494a3a2f54a65f87f

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

a2e9767225d3c3fa55f31c2494a3a2f54a65f87f