projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96f5598 7855c94)
[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Fri, 7 Jan 2011 04:52:27 +0000 (10:22 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Fri, 7 Jan 2011 04:52:27 +0000 (10:22 +0530)
bzr revid: ara@tinyerp.com-20110106113444-vu30ji9ouaz5hykv
bzr revid: ara@tinyerp.com-20110107045227-u9z3oegwmfzxk14b


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