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)
commitc045b91ccff4120c9084e57101955aa64892acf0
treeef6838d52e6cdeb052a45d749052b0546b36e346
parentc09cc1ce345eb09e7dbf518b63dc47573b1ecaa4
parent45b3ce93e9483b672d4b2258e1ff3dd228ece786
Merge branch 'master' into membership_grouped