Merge cockpit (186-1) import into refs/heads/workingbranch
authorMartin Pitt <mpitt@debian.org>
Wed, 23 Jan 2019 16:25:51 +0000 (16:25 +0000)
committerMartin Pitt <mpitt@debian.org>
Wed, 23 Jan 2019 16:25:51 +0000 (16:25 +0000)

Trivial merge