From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 16 Nov 2012 09:24:16 +0000 (+0100)
Subject: Merge branch 'master' into v7
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27static%27%2C%20filename=%27css/A?a=commitdiff_plain;h=57c488c7cff3094bb39398610bca8f22a0b0de87;p=burette%2Fbikecoop.git

Merge branch 'master' into v7
---

57c488c7cff3094bb39398610bca8f22a0b0de87