From: Luke Dashjr Date: Tue, 17 Jan 2012 03:27:59 +0000 (-0500) 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~29^2 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=70550ed81be022c81826791a75dd1567db1d667b Merge branch '0.4.x' into 0.5.0.x --- 70550ed81be022c81826791a75dd1567db1d667b