Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 9 Jan 2014 21:29:22 +0000 (22:29 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 9 Jan 2014 21:29:22 +0000 (22:29 +0100)
commit32c3c4b76748a764f3ae0333f40f02571bab3cd2
treea9efc1dc9762bdeeff742e1c4e4008742dcf4de0
parentf34cfa2213cd075152f3c22d3d0fc378270bbd49
parentedab44424e0f571a85468a80cd25a66dcf87c2a2
Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers