From: Louis <spalax@gresille.org>
Date: Mon, 21 Jul 2014 12:28:15 +0000 (+0200)
Subject: Merge branch 'master' of git://ikiwiki.branchable.com
X-Git-Tag: debian/3.20140815~27
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f61b8714bac5fb474ea2cfe40e6bd479ded8532a

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

f61b8714bac5fb474ea2cfe40e6bd479ded8532a