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)
commit681e735fc62d9239438b355066a5c4029fb77e28
treecf2ba04ce2e680dddb5891184a8a7d2c91f3d537
parentb5f16e0591dace6cb0ca1b4b4a3f1152b914fbf9
parent668d2624dccccda084a87d6f1d5bdfe307b94cdb
Merge branch 'master' into membership_grouped
remembership.py