Merge branch 'C4702' of https://github.com/svost/novacoin into svost-C4702
authorMASM fan <masmfan@gmail.com>
Wed, 8 Apr 2015 17:16:28 +0000 (10:16 -0700)
committerMASM fan <masmfan@gmail.com>
Wed, 8 Apr 2015 17:16:28 +0000 (10:16 -0700)
commit517452a057ea186fa6b356cda11f5c4a82ba6768
treea88854e7f6b2fc6d9ad57206df1d58536aff90cf
parent1971aad0566a3279dd95d3fed695fd9ffca76d71
parent9d9b17dd28be64f46d418ec8deb9cfea9bc3d785
Merge branch 'C4702' of https://github.com/svost/novacoin into svost-C4702