From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 2 Apr 2012 13:37:09 +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~10
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=dce656f9e0b7283e842225c6c75396532c659858

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

dce656f9e0b7283e842225c6c75396532c659858