Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Thu, 19 Feb 2015 19:32:21 +0000 (22:32 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Thu, 19 Feb 2015 19:32:21 +0000 (22:32 +0300)

Trivial merge