Merge tag 'debian/0.25-2'
authorDavid Bremner <david@tethera.net>
Sat, 29 Jul 2017 11:52:28 +0000 (07:52 -0400)
committerDavid Bremner <david@tethera.net>
Sat, 29 Jul 2017 11:52:28 +0000 (07:52 -0400)
uploaded to unstable


Trivial merge