From: Simon McVittie <smcv@debian.org>
Date: Thu, 29 Dec 2016 20:47:46 +0000 (+0000)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20170111_bpo8+1~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e15a490067991448c3b65323ad9ecdc774dbfe4?ds=sidebyside;hp=2e15a490067991448c3b65323ad9ecdc774dbfe4

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