Code

Merge branch 'master' into wheezy-backports-sloppy
authorMarc Fournier <marc@bl.uem.li>
Fri, 29 Jan 2016 13:18:10 +0000 (14:18 +0100)
committerMarc Fournier <marc@bl.uem.li>
Fri, 29 Jan 2016 13:18:10 +0000 (14:18 +0100)
commitec371b734804763616e8604b1d912f64d9dd38d3
tree6b9559483747c00ceedcf5f58d20558b87348b5f
parent26346b623e240154602ef7d4696dd8b4d2c30713
parent43eaffdd5ad4aaf2333bc2085e55a09a7a3d80cd
Merge branch 'master' into wheezy-backports-sloppy
debian/changelog
debian/rules