From: MASM fan <masmfan@gmail.com>
Date: Wed, 12 Nov 2014 19:35:12 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gades/novacoin into gades-master
X-Git-Tag: nvc-v0.5.0~42^2~2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=d261707f40ef3e768c2c01535bd713d7a3aa6099

Merge branch 'master' of github.com:gades/novacoin into gades-master
---

d261707f40ef3e768c2c01535bd713d7a3aa6099