From: Simon McVittie <smcv@debian.org>
Date: Mon, 30 Nov 2015 21:02:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.20160121~46
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/782a2e016bf98e80eaa9a22067d8fde81b3f6835

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

782a2e016bf98e80eaa9a22067d8fde81b3f6835