Merge docker.io (1.11.2~ds1-5) import into refs/heads/workingbranch
authorTianon Gravi <tianon@debian.org>
Tue, 12 Jul 2016 14:46:35 +0000 (15:46 +0100)
committerTianon Gravi <tianon@debian.org>
Tue, 12 Jul 2016 14:46:35 +0000 (15:46 +0100)

Trivial merge