From: Christophe Matthieu Date: Wed, 22 May 2013 10:02:39 +0000 (+0200) Subject: [MERGE] from trunk X-Git-Tag: InsPy_master01~1224^2~16 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=aed639f6d103bc63ad4d4f70ff16f9bd3bc66771;p=odoo%2Fodoo.git [MERGE] from trunk bzr revid: chm@openerp.com-20130522100239-sbkwtitaxy8hj1cx --- aed639f6d103bc63ad4d4f70ff16f9bd3bc66771