Merge branch 'debian'
authorChristoph Berg <myon@debian.org>
Sun, 6 Jul 2014 16:34:30 +0000 (18:34 +0200)
committerChristoph Berg <myon@debian.org>
Sun, 6 Jul 2014 16:34:30 +0000 (18:34 +0200)

Trivial merge