Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 19 Apr 2013 01:52:15 +0000 (03:52 +0200)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 19 Apr 2013 01:52:15 +0000 (03:52 +0200)

Trivial merge