Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Sun, 7 Dec 2014 02:11:59 +0000 (06:11 +0400)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 7 Dec 2014 02:11:59 +0000 (06:11 +0400)

Trivial merge