projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de9f0c9 1429f43)
[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 07:04:34 +0000 (12:34 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 07:04:34 +0000 (12:34 +0530)
bzr revid: fka@tinyerp.com-20120903051925-r01yx7u7nvono353
bzr revid: fka@tinyerp.com-20120903070434-on2thgronzgnk5am


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