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

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

9a133240d307abc964409540dba337b133922f7f