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)
commitf503d8c6e0bcba30dc1348e98c037abe7b49907d
tree26e9b113f98a280f0d7fa05b0aa716c9921eef38
parent81b246fc7d07df5d3b5912b34761d0ea28dfdc8a
parente2b1971d61187cadda0460f97d1e6de23c13376e
Merge branch 'master' of ssh://git.cyclocoop.org/cyclowiki