[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 28 May 2010 09:15:04 +0000 (14:45 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 28 May 2010 09:15:04 +0000 (14:45 +0530)
commit1f29f09ff337c75520eab13a687f7f96bfc4d064
treec31b5c4c37011305b94e302303450c8e8dfe62cd
parent7458372c01b4f241a684094d3309e09fd673184c
parent22ae201f7904c16292422546e1779740ce230991
[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100528091504-l76uiduokyt7hx5o