From: Simon McVittie <smcv@debian.org>
Date: Thu, 29 Dec 2016 17:38:12 +0000 (+0000)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20170111_bpo8+1~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a6e69822f68864512d49a954a4581511246f0e0b?hp=a6e69822f68864512d49a954a4581511246f0e0b

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