From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sun, 6 May 2012 05:35:58 +0000 (+0000)
Subject: Merge branch '0.5.x' into 0.6.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2^2~14
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=457ff3a437a1b8907ba072001f935a8c67e9193a

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

457ff3a437a1b8907ba072001f935a8c67e9193a