From: MASM fan Date: Sun, 11 Jan 2015 18:45:00 +0000 (-0800) Subject: Merge branch 'master' of ssh://github.com/novacoin-project/novacoin X-Git-Tag: nvc-v0.5.1~7 X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=803ce1dc5383f2ef0767019ed02e38693eb3c14d;hp=-c;p=novacoin.git Merge branch 'master' of ssh://github.com/novacoin-project/novacoin --- 803ce1dc5383f2ef0767019ed02e38693eb3c14d