Merge branch 'master' of burette.heureux-cyclage.org:ateliers
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Tue, 19 Feb 2013 14:53:50 +0000 (15:53 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Tue, 19 Feb 2013 14:53:50 +0000 (15:53 +0100)

Trivial merge