Merge remote-tracking branch 'origin/julm' into membership_grouped
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 17 Jan 2013 08:13:33 +0000 (09:13 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 17 Jan 2013 08:13:33 +0000 (09:13 +0100)

Trivial merge