Merge branch 'master' into membership_grouped
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 11 Jan 2013 12:00:41 +0000 (13:00 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 11 Jan 2013 12:00:41 +0000 (13:00 +0100)
1  2 
remembership.py

diff --cc remembership.py
Simple merge