From: Thibault Delavallée <tde@openerp.com>
Date: Mon, 13 Aug 2012 19:30:29 +0000 (+0200)
Subject: [MERGE] Merged with addons/trunk.
X-Git-Tag: 7.0-server~2484^2~5
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=0c3e1607ded9646d96b517165cd92a1d0e419ee5;p=odoo%2Fodoo.git

[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120813193029-jsilsux051e53van
---

0c3e1607ded9646d96b517165cd92a1d0e419ee5