Merge branch 'master' of ssh://git.cyclocoop.org/cyclowiki
authorAline Dannappe <aline@cyclocoop.org>
Tue, 7 Jun 2016 14:36:44 +0000 (16:36 +0200)
committerAline Dannappe <aline@cyclocoop.org>
Tue, 7 Jun 2016 14:36:44 +0000 (16:36 +0200)

Trivial merge