Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Sun, 3 Apr 2016 23:27:59 +0000 (02:27 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 3 Apr 2016 23:27:59 +0000 (02:27 +0300)

Trivial merge