Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
authorMASM fan <masmfan@gmail.com>
Sun, 4 Jan 2015 06:59:23 +0000 (22:59 -0800)
committerMASM fan <masmfan@gmail.com>
Sun, 4 Jan 2015 06:59:23 +0000 (22:59 -0800)

Trivial merge