From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 6 Apr 2012 21:45:20 +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~5
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=9bf1140b90387643ad83e89199e391d002352b22

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

9bf1140b90387643ad83e89199e391d002352b22