From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 12 Jul 2013 08:26:24 +0000 (+0200)
Subject: [MERGE] master->v2
X-Git-Url: http://git.cyclocoop.org//%22%22.htmlspecialchars%28self::makeUrl%28%27-%27%2C%27action=raw&smaxage=0&gen=js%27%29%29.%22/%22?a=commitdiff_plain;h=7d2bf9c79c34286344a177be008b53b5aeb85970;p=lhc%2Fweb%2Fwww.git

[MERGE] master->v2
---

7d2bf9c79c34286344a177be008b53b5aeb85970