From: Blockmeta-区块元 <blockmeta@8btc.com>
Date: Sat, 28 Oct 2017 05:53:17 +0000 (+0800)
Subject: Merge branch 'dev' into wallet
X-Git-Tag: v1.0.5-alpha~648^2~3^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=56b2a2c0746e626d77a4c989c515b45cb7de4d56;p=bytom%2Fbytom-spv.git

Merge branch 'dev' into wallet
---

56b2a2c0746e626d77a4c989c515b45cb7de4d56