From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 21 Mar 2012 17:50:35 +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~13
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=d1eafe56c8f2e2912529a852bfd98b6e404560c9

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

d1eafe56c8f2e2912529a852bfd98b6e404560c9