Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Thu, 1 Oct 2015 21:33:54 +0000 (14:33 -0700)
committerCryptoManiac <balthazar@yandex.ru>
Thu, 1 Oct 2015 21:33:54 +0000 (14:33 -0700)

Trivial merge