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)
Conflicts:
remembership.py


No differences found