From: Quentin (OpenERP) Date: Fri, 9 Dec 2011 16:21:39 +0000 (+0100) Subject: [MERGE] merged with main trunk X-Git-Tag: 6.1.0-rc1-addons~665^2~9 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=7a7a4c2ea9a1e12a656b365b8e584a778949ab33;p=odoo%2Fodoo.git [MERGE] merged with main trunk bzr revid: qdp-launchpad@openerp.com-20111209162139-9siz7s4akq3wlyhb --- 7a7a4c2ea9a1e12a656b365b8e584a778949ab33