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)
commit818b0f90fa04259d4f1fff008881ba80381e46b3
treef20563777310e3b70bb28deee024b75882b604c5
parente4ee2addb0b8d8abffae05814acaed7580cdd8c5
parent4978be72a4a823bec7c9b6656e8162ce44a29dce
Merge branch 'patch' of https://github.com/svost/novacoin into svost-patch

Conflicts:
novacoin-qt.pro