Merge branch 'master' of ssh://git.cyclocoop.org/cyclowiki
authorsp <severine@cyclocoop.org>
Mon, 21 Jul 2014 10:40:40 +0000 (12:40 +0200)
committersp <severine@cyclocoop.org>
Mon, 21 Jul 2014 10:40:40 +0000 (12:40 +0200)

Trivial merge