Merge branch 'master' of github.com:0xDEADFACE/novacoin into DEADFACE
authorMASM fan <masmfan@gmail.com>
Wed, 12 Nov 2014 20:26:50 +0000 (00:26 +0400)
committerMASM fan <masmfan@gmail.com>
Wed, 12 Nov 2014 20:26:50 +0000 (00:26 +0400)
commite5bad7e0ce0055de912222776edfae9059c6e3c7
tree06eba9b00e1ddd385b4c65861a91995f39ffe5e7
parentaae3223bfcf46936149aa681a4db64d856c942b0
parentcf02311bd55a80dc198d7541582308e5658e5983
Merge branch 'master' of github.com:0xDEADFACE/novacoin into DEADFACE