From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 12 Jul 2013 15:50:29 +0000 (+0200)
Subject: [MERGE]  v1->v2
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwww.git;a=commitdiff_plain;h=a2147983aeaedced447a4742d32ad794aee750e0

[MERGE]  v1->v2
---

a2147983aeaedced447a4742d32ad794aee750e0