Merge branch 'julm' into membership_grouped
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 11 Jan 2013 17:27:27 +0000 (18:27 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 11 Jan 2013 17:27:27 +0000 (18:27 +0100)
commitc6482d69cb97eee19be531276e88b5144ef8376d
treec7cb913b632dd147242e1ad1ad57ad88aa977307
parentf240fa726d73949ec5c3630771a2288cf06075e4
parent514e61eeeea5e8c2e804726185ead891420460ce
Merge branch 'julm' into membership_grouped

Conflicts:
remembership.py
remembership.py