projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b09ade2 f5f8cb0)
[MERGE] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 4 Jul 2012 04:47:19 +0000 (10:17 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 4 Jul 2012 04:47:19 +0000 (10:17 +0530)
bzr revid: mdi@tinyerp.com-20120703043946-teq4hy2tmf5b4mmp
bzr revid: mdi@tinyerp.com-20120704044719-61dkmgezoaer3dgw


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