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

Trivial merge