Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Fri, 5 Jan 2018 00:26:06 +0000 (20:26 -0400)
committerDavid Bremner <david@tethera.net>
Fri, 5 Jan 2018 00:26:06 +0000 (20:26 -0400)
debian updates


Trivial merge