From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 11 Jan 2013 17:27:27 +0000 (+0100)
Subject: Merge branch 'julm' into membership_grouped
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=c6482d69cb97eee19be531276e88b5144ef8376d;hp=c6482d69cb97eee19be531276e88b5144ef8376d;p=burette%2Fremembership.git

Merge branch 'julm' into membership_grouped

Conflicts:
	remembership.py
---