Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Fri, 19 Dec 2014 17:23:49 +0000 (09:23 -0800)
committerCryptoManiac <balthazar@yandex.ru>
Fri, 19 Dec 2014 17:23:49 +0000 (09:23 -0800)

Trivial merge