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)
commitb696bb759e1345ee4e1cf18db1afaea52c3bd85f
treeaf4dffe025026136b5841e6b3c37149de210ed9e
parent59a8c28b82c89b7c5c7a722a8e2b874b790a4357
parentddf66afb592da805784ef3ed52e1b4c88f9b0fd6
Merge branch 'master' into membership_grouped