From: Simon McVittie <smcv@debian.org>
Date: Thu, 29 Dec 2016 21:34:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.20170110~23
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a60f837695b24b8360b59a8fc8ca1f794b77bd76?hp=-c

Merge remote-tracking branch 'origin/master'
---

a60f837695b24b8360b59a8fc8ca1f794b77bd76