Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Sun, 20 Sep 2015 17:22:14 +0000 (20:22 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 20 Sep 2015 17:22:14 +0000 (20:22 +0300)

Trivial merge