Merge branch 'master' into membership_grouped
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Sun, 16 Dec 2012 10:16:04 +0000 (11:16 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Sun, 16 Dec 2012 10:16:04 +0000 (11:16 +0100)

Trivial merge