Merge branch 'test'
authorJoerg Jaspert <joerg@debian.org>
Sun, 20 May 2018 12:45:51 +0000 (14:45 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 20 May 2018 12:45:51 +0000 (14:45 +0200)
* test:
  Mini DebConf Hamburg


Trivial merge