From: Louis <spalax@gresille.org>
Date: Sat, 18 Feb 2017 21:56:06 +0000 (+0100)
Subject: Merge branch 'master' of git://ikiwiki.branchable.com
X-Git-Tag: debian/3.20170622~116
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/37056e736af7a2b8c19a4f0108d0f77463f848b9

Merge branch 'master' of git://ikiwiki.branchable.com
---

37056e736af7a2b8c19a4f0108d0f77463f848b9