Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 26 Sep 2015 13:31:50 +0000 (10:31 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 26 Sep 2015 13:31:50 +0000 (10:31 -0300)
bring debian specific changes into master


Trivial merge