Merge branch 'master' of github.com:CryptoManiac/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Fri, 25 Jul 2014 17:54:57 +0000 (21:54 +0400)
committerCryptoManiac <balthazar@yandex.ru>
Fri, 25 Jul 2014 17:54:57 +0000 (21:54 +0400)

Trivial merge