Code

Merge branch 'master' into wheezy-backports-sloppy
authorMarc Fournier <marc@bl.uem.li>
Thu, 5 Jan 2017 21:25:07 +0000 (22:25 +0100)
committerMarc Fournier <marc@bl.uem.li>
Thu, 5 Jan 2017 21:25:07 +0000 (22:25 +0100)
commit90ffd47feaedad86405eef69ec3608b1b310c930
tree92590eac3529ffbe94cdc0f55dbbb466255b9251
parentb5d934ae97c8679a4d21a86d1cc174d3d8f79e0d
parent2de9f5f705be51e44f94c67d16319baa6c7d40f6
Merge branch 'master' into wheezy-backports-sloppy
debian/changelog
debian/control
debian/rules