projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1eb0043 cec201b)
[MERGE]merge with lp:openobject-server
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Wed, 23 May 2012 05:18:40 +0000 (10:48 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Wed, 23 May 2012 05:18:40 +0000 (10:48 +0530)
bzr revid: mma@tinyerp.com-20120523051840-a80t8z0fkfg127h4


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