Merge branch 'master' into membership_grouped
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 17 Dec 2012 08:18:06 +0000 (09:18 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 17 Dec 2012 08:18:06 +0000 (09:18 +0100)
commit59a8c28b82c89b7c5c7a722a8e2b874b790a4357
treeef6838d52e6cdeb052a45d749052b0546b36e346
parentc045b91ccff4120c9084e57101955aa64892acf0
parentcd599cd4d0e3c8a7d8eb1b20a20737b3106cbc57
Merge branch 'master' into membership_grouped