From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 17 Aug 2018 18:00:50 +0000 (-0400)
Subject: Merge pull request #118 from TheBlueMatt/2018-08-103-rebased
X-Git-Tag: v0.0.12~347
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=0f24a67c825ff2ec9a7656f6fda25726149b8212;p=rust-lightning

Merge pull request #118 from TheBlueMatt/2018-08-103-rebased

Rebase of #103
---

0f24a67c825ff2ec9a7656f6fda25726149b8212