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)
commitb6205042736e582d01e18f1cd12c821fadc7e042
treed9977eff14490db44e5732f7c4dde24636599797
parent0c20083678079af9ba1df26809d118ac1940ca85
parent8eea6e818f6b024c34021e48c48944181ba41077
Merge branch 'test'

* test:
  Mini DebConf Hamburg