Merge zimlib (1.4-2.1) import into refs/heads/workingbranch
authorGraham Inggs <ginggs@debian.org>
Fri, 21 Apr 2017 08:06:38 +0000 (09:06 +0100)
committerGraham Inggs <ginggs@debian.org>
Fri, 21 Apr 2017 08:06:38 +0000 (09:06 +0100)

Trivial merge