Merge branch 'master' into membership_grouped
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Wed, 19 Dec 2012 11:31:23 +0000 (12:31 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Wed, 19 Dec 2012 11:31:23 +0000 (12:31 +0100)

Trivial merge