Merge branch 'master' of localhost:cyclowiki
authorwiki-cyclo-wiki <wiki-cyclo-wiki@ateliers.heureux-cyclage.org>
Tue, 11 Oct 2016 12:47:01 +0000 (14:47 +0200)
committerwiki-cyclo-wiki <wiki-cyclo-wiki@ateliers.heureux-cyclage.org>
Tue, 11 Oct 2016 12:47:01 +0000 (14:47 +0200)

Trivial merge