Merge cockpit (185-1) import into refs/heads/workingbranch
authorMartin Pitt <mpitt@debian.org>
Thu, 17 Jan 2019 07:43:10 +0000 (07:43 +0000)
committerMartin Pitt <mpitt@debian.org>
Thu, 17 Jan 2019 07:43:10 +0000 (07:43 +0000)

Trivial merge