From: Simon McVittie <smcv@debian.org>
Date: Mon, 9 May 2016 21:18:43 +0000 (+0100)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20170111_bpo8+1~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/766311f45b4351488d7dad519a6471094a58da16?ds=sidebyside;hp=766311f45b4351488d7dad519a6471094a58da16

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