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)
commitafd843a9cef86e66258d2ce55421fb50b94d1c9c
treecb70956b687ab5b6254e6ead96cbfe32957c7e6d
parentbf1c09aae70ddfc49f9cd3e3762afa8b7002b585
parent4d9737174f95839686b72282fd13eff15368994b
Merge branch 'master' into membership_wizard
__openerp__.py