Merge pull request #145 from TheBlueMatt/2018-09-134-rebased

author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>

Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)

committer GitHub <noreply@github.com>

Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)
committer GitHub <noreply@github.com>
Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)
diff --cc src/ln/channel.rs
Simple merge
diff --cc src/ln/channelmanager.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)
committer	GitHub <noreply@github.com>
	Mon, 3 Sep 2018 22:10:51 +0000 (18:10 -0400)
		1	2
src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history