From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 5 Jan 2012 23:19:29 +0000 (-0500)
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~33
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=7de7913abdbaa30f0ef6ad1b63508d3a8441d08f

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

7de7913abdbaa30f0ef6ad1b63508d3a8441d08f