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.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/User:Test/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=a2147983aeaedced447a4742d32ad794aee750e0;p=lhc%2Fweb%2Fwww.git

[MERGE]  v1->v2
---

a2147983aeaedced447a4742d32ad794aee750e0