Merge branch 'master' of https://github.com/gades/novacoin
Merge branch 'master' of https://github.com/gades/novacoin