From: Luke Dashjr Date: Sun, 12 Feb 2012 02:26:11 +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~22^2 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=8ad6996cc38c7e5e21698db91759fcc3e8900545 Merge branch '0.4.x' into 0.5.0.x --- 8ad6996cc38c7e5e21698db91759fcc3e8900545