merge with master
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 15 Nov 2012 14:58:16 +0000 (15:58 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Thu, 15 Nov 2012 14:58:16 +0000 (15:58 +0100)
1  2 
__openerp__.py

diff --cc __openerp__.py
Simple merge