Merge tag 'debian/0.17-4'
authorDavid Bremner <david@tethera.net>
Sat, 22 Feb 2014 01:05:05 +0000 (21:05 -0400)
committerDavid Bremner <david@tethera.net>
Sat, 22 Feb 2014 01:05:05 +0000 (21:05 -0400)
uploaded to Debian unstable


Trivial merge