From: Simon McVittie <smcv@debian.org>
Date: Fri, 6 May 2016 19:05:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: debian/3.20160509~26
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/847c9f232efad6820cb7788994c2418a8cb89992

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

847c9f232efad6820cb7788994c2418a8cb89992