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)
commitc6444ebc7248037fccd5ff6e66f0b180f84a6302
tree626cc6bfa9d8acf3ba7d072a615ec9b3d98f8ee3
parentc8a7f72c867da909f4a4dd1d1e1c028ba8547590
parent6db4fbd4f5551a96c74b4d54b6f09875658a27e8
Merge branch 'master' of ssh://github.com/novacoin-project/novacoin