From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 1 Aug 2013 12:49:10 +0000 (+0200)
Subject: [MERGE] from trunk
X-Git-Tag: InsPy_master01~73^2~1887^2~1
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=9b2b9447190f759fc92356bb727056f4f495d372;p=odoo%2Fodoo.git

[MERGE] from trunk

bzr revid: chm@openerp.com-20130801124910-88hspvafqzkgvctt
---

9b2b9447190f759fc92356bb727056f4f495d372