projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9a9da6 bed2f2f)
[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 15 Jun 2012 04:51:35 +0000 (10:21 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 15 Jun 2012 04:51:35 +0000 (10:21 +0530)
bzr revid: mdi@tinyerp.com-20120615045135-im1zek1i0yq53e5j


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