Merge branch 'master' of ssh://git.cyclocoop.org/cyclowiki
authorsp <severine@cyclocoop.org>
Sun, 8 Jun 2014 13:53:25 +0000 (15:53 +0200)
committersp <severine@cyclocoop.org>
Sun, 8 Jun 2014 13:53:25 +0000 (15:53 +0200)

Trivial merge