From: Luke Dashjr Date: Wed, 21 Mar 2012 17:19: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~14^2 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=17a5fd9248ce62ca412f7098ca261d4b4271cc99 Merge branch '0.4.x' into 0.5.0.x --- 17a5fd9248ce62ca412f7098ca261d4b4271cc99