From: Blockmeta-区块元 <blockmeta@8btc.com>
Date: Thu, 2 Nov 2017 03:02:02 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/dev' into wallet
X-Git-Tag: v1.0.5~457^2~3^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ebed938fb50155a54ed0715907c481c7a3186e6d;p=bytom%2Fbytom.git

Merge remote-tracking branch 'origin/dev' into wallet
---

ebed938fb50155a54ed0715907c481c7a3186e6d