projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fff7cf 46e8b36)
[MERGE] merge with main
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Thu, 7 Jun 2012 11:42:51 +0000 (17:12 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Thu, 7 Jun 2012 11:42:51 +0000 (17:12 +0530)
bzr revid: kjo@tinyerp.com-20120607114251-l3w31xsksvx1mpkz


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