From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Thu, 23 Aug 2018 19:29:15 +0000 (-0400)
Subject: Merge pull request #125 from TheBlueMatt/2018-08-114-rebase
X-Git-Tag: v0.0.12~344
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d0e1e7fead1ff0120f30f4b24e351eb4cdb10cf4;p=rust-lightning

Merge pull request #125 from TheBlueMatt/2018-08-114-rebase

Rebase of #114
---

d0e1e7fead1ff0120f30f4b24e351eb4cdb10cf4