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)
commit8b7d41eb96b2f951835f1adebea1cf1f0a2a83ad
tree06eba9b00e1ddd385b4c65861a91995f39ffe5e7
parente981682434d01b75d2279f411ed07f30375e0170
parente5bad7e0ce0055de912222776edfae9059c6e3c7
Merge pull request #2 from novacoin-project/master

Merge from original