Merge pull request #3 from novacoin-project/master
authorgades <gades@users.noreply.github.com>
Fri, 21 Nov 2014 19:30:48 +0000 (21:30 +0200)
committergades <gades@users.noreply.github.com>
Fri, 21 Nov 2014 19:30:48 +0000 (21:30 +0200)
Sync with novacoin master repository


Trivial merge