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)
commit803ce1dc5383f2ef0767019ed02e38693eb3c14d
tree871d98cde18d80395a39d077e92ffcb0329900a5
parent5b1f0a0a62474909ea2c798bbd440d2790d042c5
parentd1923f2d8b5824cae0e77674c38e6f7e28ea9363
Merge branch 'master' of ssh://github.com/novacoin-project/novacoin