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)
commit0b0d9e1bc6e5df71ae433469317d12efc763d0fc
tree497642133c9109dbec76257beee1b63ffe5976c1
parentc6364e7f89604060ce6021e35799f49605920e10
parent3d21bc2abf74b7140f3220d0b72b231ec3493ed1
Merge branch 'master' of ssh://git.cyclocoop.org/cyclowiki