Merge branch 'patch' of https://github.com/svost/novacoin into svost-patch
author0xDEADFACE <masmfan@gmail.com>
Sun, 18 Oct 2015 19:50:58 +0000 (12:50 -0700)
committer0xDEADFACE <masmfan@gmail.com>
Sun, 18 Oct 2015 19:50:58 +0000 (12:50 -0700)
Conflicts:
novacoin-qt.pro


Trivial merge