projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02d7be5 b5215f1)
[Merge] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorsbh (Open ERP) <sbh@tinyerp.com>
Fri, 11 Jun 2010 04:58:22 +0000 (10:28 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Fri, 11 Jun 2010 04:58:22 +0000 (10:28 +0530)
bzr revid: sbh@tinyerp.com-20100611045822-4ye1nc7xoebtxfnv


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.