projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76dc477 e117aca)
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_evaluation-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:02:30 +0000 (15:32 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:02:30 +0000 (15:32 +0530)
bzr revid: apa@tinyerp.com-20120426100230-5asz2f3lteg1mrkw


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