]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into spalax
authorLouis <spalax@gresille.org>
Thu, 17 Jul 2014 10:29:01 +0000 (12:29 +0200)
committerLouis <spalax@gresille.org>
Thu, 17 Jul 2014 10:29:01 +0000 (12:29 +0200)

Trivial merge