From: Louis <spalax@gresille.org>
Date: Thu, 17 Jul 2014 10:29:01 +0000 (+0200)
Subject: Merge branch 'master' into spalax
X-Git-Tag: debian/3.20140815~28
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/774cf3d323e7f34d7bed19800c5439d38b48c894?ds=sidebyside;hp=-c

Merge branch 'master' into spalax
---

774cf3d323e7f34d7bed19800c5439d38b48c894