Merge branch 'julm' chris
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 3 Dec 2012 16:56:43 +0000 (17:56 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 3 Dec 2012 16:56:43 +0000 (17:56 +0100)
commit65849a99b18f81ea937ef242def27f8aca4002ca
tree8419ae60bb753cd204219f0ed36718c4602eeb36
parent98ef5faba796605b5b6173b745826167d541a44b
parentf558b11f8acbcb112d348fded1f7530195067104
Merge branch 'julm'