Merge tag 'debian/0.18.1-2' into wheezy-backports
authorDavid Bremner <david@tethera.net>
Tue, 26 Aug 2014 00:56:57 +0000 (17:56 -0700)
committerDavid Bremner <david@tethera.net>
Tue, 26 Aug 2014 00:56:57 +0000 (17:56 -0700)
commit28fda31544f2155bce2ec8d3f6244026af4781c6
treeea7aab7de96ce2a3d1b63ae93eb80276ce8be523
parented1cec37df5f5b7516b8eec24a606f835c1a5e25
parent01c8bf89a456cae9221bb57a130758a7a6dc005b
Merge tag 'debian/0.18.1-2' into wheezy-backports

uploaded to Debian unstable

Conflicts:
debian/changelog
debian/changelog