Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
authorMASM fan <masmfan@gmail.com>
Tue, 13 Jan 2015 19:02:35 +0000 (11:02 -0800)
committerMASM fan <masmfan@gmail.com>
Tue, 13 Jan 2015 19:02:35 +0000 (11:02 -0800)

Trivial merge