From: Simon Paillard Date: Wed, 17 Aug 2011 19:39:45 +0000 (+0200) Subject: Merge branch 'master' into debian-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=49b3b99bcbd6acc64f44eb5a8ac3bf69c232ca0e;p=deb%2Fpackages.git Merge branch 'master' into debian-master --- 49b3b99bcbd6acc64f44eb5a8ac3bf69c232ca0e