Merge branch 'master' of git+ssh://git.debian.org/git/mirror/debian.org
authorHolger Levsen <holger@layer-acht.org>
Sun, 26 May 2013 19:41:43 +0000 (21:41 +0200)
committerHolger Levsen <holger@layer-acht.org>
Sun, 26 May 2013 19:41:43 +0000 (21:41 +0200)

Trivial merge