Merge https://git.nsb-software.de/joerg/debian.org
authorJulien Cristau <jcristau@debian.org>
Sun, 18 Jun 2017 12:52:47 +0000 (14:52 +0200)
committerJulien Cristau <jcristau@debian.org>
Sun, 18 Jun 2017 12:52:47 +0000 (14:52 +0200)
Signed-off-by: Julien Cristau <jcristau@debian.org>

Trivial merge