projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb27940 0cae862)
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 13 Jan 2011 05:11:41 +0000 (10:41 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 13 Jan 2011 05:11:41 +0000 (10:41 +0530)
bzr revid: rpa@tinyerp.com-20110113051141-o4ccg3ukl1vy06gt


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