From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 16 Mar 2012 21:28:22 +0000 (-0400)
Subject: Merge branch '0.5.0.x' into 0.5.3.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~12^2~2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=c1c86b147b50ae470eef91e3cf874e33f54bdfea

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

c1c86b147b50ae470eef91e3cf874e33f54bdfea