Merge branch 'master' of localhost:cyclowiki
authorjulm <julm@ateliers.heureux-cyclage.org>
Mon, 13 Apr 2015 18:49:54 +0000 (20:49 +0200)
committerwiki-cyclo-wiki <wiki-cyclo-wiki@ateliers.heureux-cyclage.org>
Mon, 13 Apr 2015 18:49:54 +0000 (20:49 +0200)

Trivial merge