Merge branch 'master' into experimental/master
authorStephane Glondu <steph@glondu.net>
Wed, 13 Jun 2012 20:37:43 +0000 (22:37 +0200)
committerStephane Glondu <steph@glondu.net>
Wed, 13 Jun 2012 20:37:43 +0000 (22:37 +0200)
commit656639e7b9f7dc893437c5d665d018600048bc54
tree8f97c361ad3346d3f347ab64c192832e08e27dfe
parent35c8c0a215b32ff4edccc726128a79a5bbe500de
parentf62103f2965826ad22548af4bc1c3af48a1d144e
Merge branch 'master' into experimental/master
debian/changelog