projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b13002 e03f111)
[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 29 Nov 2012 04:27:11 +0000 (09:57 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 29 Nov 2012 04:27:11 +0000 (09:57 +0530)
bzr revid: mdi@tinyerp.com-20121129042711-not0us62x2p681fj


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