Merge branch 'master' of git://ikiwiki.branchable.com
authorLouis <spalax@gresille.org>
Mon, 21 Jul 2014 12:28:15 +0000 (14:28 +0200)
committerLouis <spalax@gresille.org>
Mon, 21 Jul 2014 12:28:15 +0000 (14:28 +0200)

Trivial merge