Zim

Merge proposals dependent on lp:~jaap.karssenberg/zim/git-master

lp:~jaap.karssenberg/zim/git-master has no merge proposals.