From: Simon McVittie <smcv@debian.org>
Date: Thu, 28 Jul 2016 09:48:04 +0000 (+0100)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20170111_bpo8+1~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7269c9af3e55dc478792d8ea010ab9b794190a66?hp=7269c9af3e55dc478792d8ea010ab9b794190a66

Merge branch 'master' into debian-jessie-backports
---