From: Luke Dashjr Date: Wed, 4 Apr 2012 19:36:25 +0000 (-0400) Subject: Merge branch '0.4.x' into 0.5.0.x X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~8^2 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a37092fcf427956e31d76aac6bd52e3e3459155f Merge branch '0.4.x' into 0.5.0.x --- a37092fcf427956e31d76aac6bd52e3e3459155f