From: CryptoManiac <balthazar@yandex.ru>
Date: Sun, 20 Sep 2015 17:22:14 +0000 (+0300)
Subject: Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
X-Git-Tag: nvc-v0.5.4~23
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=17e6270155f8a3d80716e7fa91b5217f84a12076

Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
---

17e6270155f8a3d80716e7fa91b5217f84a12076