projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7ee024 1dbc083)
[MERGE]: merging with the same branch
authorAmit Dodiya (OpenERP) <ado@tinyerp.com>
Mon, 25 Jul 2011 11:22:57 +0000 (16:52 +0530)
committerAmit Dodiya (OpenERP) <ado@tinyerp.com>
Mon, 25 Jul 2011 11:22:57 +0000 (16:52 +0530)
bzr revid: ado@tinyerp.com-20110725112257-sji7n6pwkcwyetws


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