From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 5 Apr 2012 22:21:01 +0000 (-0400)
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~7
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=0d10cb7a1f6314760ef8895490e5c1042c3549b1

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

0d10cb7a1f6314760ef8895490e5c1042c3549b1