Merge branch 'master' into membership_wizard membership_wizard
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 15 Nov 2012 15:02:14 +0000 (16:02 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 15 Nov 2012 15:02:14 +0000 (16:02 +0100)
1  2 
__openerp__.py

diff --cc __openerp__.py
Simple merge