Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Thu, 17 Aug 2017 00:44:43 +0000 (21:44 -0300)
committerDavid Bremner <david@tethera.net>
Thu, 17 Aug 2017 00:44:43 +0000 (21:44 -0300)
commit9836a8f42bf83d57950f670e69d72854ee5e063b
tree35667ebda9b9340f3554e2c2bfcb634cc9b1f440
parent1307868f1e885fe5791a7c63ba33329eef405a80
parentd7b5db32c3bf6b5e6c5f75d110355a9f5b5a59b8
Merge branch 'release'

merge in debian-only changes