Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Thu, 1 Oct 2015 19:25:44 +0000 (12:25 -0700)
committerCryptoManiac <balthazar@yandex.ru>
Thu, 1 Oct 2015 19:25:44 +0000 (12:25 -0700)

Trivial merge