Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
authorMASM fan <masmfan@gmail.com>
Sun, 11 Jan 2015 18:45:00 +0000 (10:45 -0800)
committerMASM fan <masmfan@gmail.com>
Sun, 11 Jan 2015 18:45:00 +0000 (10:45 -0800)

Trivial merge