From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 12 Sep 2018 15:22:06 +0000 (-0400)
Subject: Merge pull request #170 from TheBlueMatt/2018-09-119-rebased
X-Git-Tag: v0.0.12~317
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b2f31c5256513f0d9744af1c61aae04acbd7c701;p=rust-lightning

Merge pull request #170 from TheBlueMatt/2018-09-119-rebased

#119 squashed
---

b2f31c5256513f0d9744af1c61aae04acbd7c701