Merge pull request #253 from TheBlueMatt/2018-11-misc-tweaks

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

Fri, 16 Nov 2018 16:47:50 +0000 (11:47 -0500)

committer GitHub <noreply@github.com>

Fri, 16 Nov 2018 16:47:50 +0000 (11:47 -0500)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 16 Nov 2018 16:47:50 +0000 (11:47 -0500)
committer GitHub <noreply@github.com>
Fri, 16 Nov 2018 16:47:50 +0000 (11:47 -0500)
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>
	Fri, 16 Nov 2018 16:47:50 +0000 (11:47 -0500)
committer	GitHub <noreply@github.com>
	Fri, 16 Nov 2018 16:47:50 +0000 (11:47 -0500)
		1	2
src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history