Merge branch 'master' of git.debian.org:/git/collab-maint/packaging-tutorial
authorLucas Nussbaum <lucas@lucas-nussbaum.net>
Wed, 25 Apr 2012 12:24:02 +0000 (14:24 +0200)
committerLucas Nussbaum <lucas@lucas-nussbaum.net>
Wed, 25 Apr 2012 12:24:02 +0000 (14:24 +0200)

Trivial merge