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)
commitbd447f9edcb84c87fb31b98eaea5ed05d8e3bb64
tree95a61a879ffd696114d7a89a318ec4e922eb6486
parent525019c056781b8d3916fb04e272055337689305
parent1c7bfa1cedc31c878ff43df4fa0fcd9b5422cd95
Merge cockpit (186-1) import into refs/heads/workingbranch