Merge branch 'master' into experimental/master
authorStephane Glondu <steph@glondu.net>
Wed, 14 Nov 2012 12:10:43 +0000 (13:10 +0100)
committerStephane Glondu <steph@glondu.net>
Wed, 14 Nov 2012 12:12:14 +0000 (13:12 +0100)
commitf76e0cd31a5cac2d24738d7e1f9911582e9f94ad
treec34bc42c2be859c4e40e985d086ab769a0364291
parent174c02a2d24e1bdb2ec47c3c8b6e9e7061883b1a
parent604d1769d7f8e577b2984fdd97aa0fc1b680c743
Merge branch 'master' into experimental/master

Conflicts:
debian/changelog
debian/rules
debian/changelog
debian/control
debian/rules