Merge branch 'C4702' of https://github.com/svost/novacoin into svost-C4702
authorMASM fan <masmfan@gmail.com>
Wed, 8 Apr 2015 17:16:28 +0000 (10:16 -0700)
committerMASM fan <masmfan@gmail.com>
Wed, 8 Apr 2015 17:16:28 +0000 (10:16 -0700)

Trivial merge