Merge branch 'master' of ssh://git.cyclocoop.org/cyclowiki
authorAline Dannappe <aline@cyclocoop.org>
Wed, 18 May 2016 07:17:24 +0000 (09:17 +0200)
committerAline Dannappe <aline@cyclocoop.org>
Wed, 18 May 2016 07:17:24 +0000 (09:17 +0200)

Trivial merge