Merge branch 'master' of github.com:novacoin-project/novacoin
authorMASM fan <masmfan@gmail.com>
Sun, 17 Aug 2014 05:29:32 +0000 (09:29 +0400)
committerMASM fan <masmfan@gmail.com>
Sun, 17 Aug 2014 05:29:32 +0000 (09:29 +0400)

Trivial merge