Merge pull request #2 from novacoin-project/master
authorgades <gades@users.noreply.github.com>
Wed, 12 Nov 2014 20:52:19 +0000 (22:52 +0200)
committergades <gades@users.noreply.github.com>
Wed, 12 Nov 2014 20:52:19 +0000 (22:52 +0200)
Merge from original


Trivial merge