From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sun, 12 Feb 2012 02:26:22 +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~22
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=9ab932b76988d41ea83d4c5cfb9353e06922ccaa

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

9ab932b76988d41ea83d4c5cfb9353e06922ccaa