projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2bc9fe 99c4f31)
[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 15 Oct 2012 05:36:17 +0000 (11:06 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 15 Oct 2012 05:36:17 +0000 (11:06 +0530)
bzr revid: mdi@tinyerp.com-20121015053617-z71o2h2ojb75x6tc


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