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)
commit1c7bfa1cedc31c878ff43df4fa0fcd9b5422cd95
treea191a1446f455bab2483520a372623d2f10599fc
parentcfa8d51f5513b5ddc34dc859c4aea5c2d637c9c7
parentfc14614a763cd9ad9f66b976cb35aa75b693e3ff
Merge cockpit (185-1) import into refs/heads/workingbranch