projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04eee48 89933f4)
[MERGE] Merge with lp:openobject-addons
authorSbh (OpenERP) <sbh@tinyerp.com>
Mon, 7 Feb 2011 07:32:02 +0000 (13:02 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Mon, 7 Feb 2011 07:32:02 +0000 (13:02 +0530)
bzr revid: sbh@tinyerp.com-20110204044653-4tw2q32jt96g8gyk
bzr revid: sbh@tinyerp.com-20110207073202-27z2vur01cl5d5dv


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