From: Simon Paillard <spaillard@debian.org>
Date: Wed, 31 Aug 2011 21:06:24 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=dfec19720f8f939dca781464da850f79a5a03490;hp=dfec19720f8f939dca781464da850f79a5a03490;p=deb%2Fpackages.git

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