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)
commitbf1c09aae70ddfc49f9cd3e3762afa8b7002b585
treed44823718ed14c5117528c86fad6bccc0c2bb5fe
parent55dba608306d71e432857185b6dfeecc93505db2
parentd91844a658f65be44776a5ae106be70bb06fad58
merge with master
__openerp__.py