projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa9fa89 f6a1567)
[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Thu, 30 Aug 2012 05:11:47 +0000 (10:41 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Thu, 30 Aug 2012 05:11:47 +0000 (10:41 +0530)
bzr revid: fka@tinyerp.com-20120830051147-rnykvglqlg3tr5e0


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