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