From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 16 Nov 2012 10:18:45 +0000 (+0100)
Subject: Merge branch 'master' into v7
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/config/%7B%7B%20url_for%28%27admin_vote_edit%27%2C%20voteid=vote.id%29%20%7D%7D?a=commitdiff_plain;h=f202f8ab773c3771b0b480295855ce4f489f3240;p=burette%2Fbikecoop.git

Merge branch 'master' into v7
---

f202f8ab773c3771b0b480295855ce4f489f3240