Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Sat, 20 Feb 2016 16:17:12 +0000 (19:17 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Sat, 20 Feb 2016 16:17:12 +0000 (19:17 +0300)

Trivial merge