From: Simon Paillard <simon.paillard@resel.enst-bretagne.fr>
Date: Mon, 10 Jan 2011 23:28:57 +0000 (+0100)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=a168232b746fed06714bbb2100be8cf15f032b30;p=deb%2Fpackages.git

Merge branch 'master' into debian-master
---

a168232b746fed06714bbb2100be8cf15f032b30