projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45b7c6f 611643d)
[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Thu, 6 Jan 2011 05:02:07 +0000 (10:32 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Thu, 6 Jan 2011 05:02:07 +0000 (10:32 +0530)
bzr revid: ara@tinyerp.com-20110105131734-q2t76dn07o2hdszm
bzr revid: ara@tinyerp.com-20110106050207-0orb7sntw1e5ptrs


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