From: DBR (OpenERP) <dbr@tinyerp.com>
Date: Fri, 23 Sep 2011 13:37:07 +0000 (+0530)
Subject: [MERGE] lp:openobject-addons
X-Git-Tag: 6.1.0-rc1-addons~2340^2~4
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=15cbbfd3a19132f0741356d0fbddfde774ff1f22;p=odoo%2Fodoo.git

[MERGE] lp:openobject-addons

bzr revid: dbr@tinyerp.com-20110923133707-9nsgqq0d1f2qdlv5
---

15cbbfd3a19132f0741356d0fbddfde774ff1f22