Merge branch 'release'

author David Bremner <david@tethera.net>

Sat, 28 Apr 2018 11:45:59 +0000 (08:45 -0300)

committer David Bremner <david@tethera.net>

Sat, 28 Apr 2018 11:45:59 +0000 (08:45 -0300)
author David Bremner <david@tethera.net>
Sat, 28 Apr 2018 11:45:59 +0000 (08:45 -0300)
committer David Bremner <david@tethera.net>
Sat, 28 Apr 2018 11:45:59 +0000 (08:45 -0300)
diff --cc NEWS
Simple merge
diff --cc debian/changelog
Simple merge
author	David Bremner <david@tethera.net>
	Sat, 28 Apr 2018 11:45:59 +0000 (08:45 -0300)
committer	David Bremner <david@tethera.net>
	Sat, 28 Apr 2018 11:45:59 +0000 (08:45 -0300)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history