projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 306eac9 3976bb7)
[MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authorsbh (Open ERP) <sbh@tinyerp.com>
Mon, 14 Jun 2010 11:31:59 +0000 (17:01 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Mon, 14 Jun 2010 11:31:59 +0000 (17:01 +0530)
bzr revid: sbh@tinyerp.com-20100614113159-bozbp3xslnvjnmw0


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