[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)
commit58072c6c34be60634888102b2e421ab4c3139937
treecad703bfae2006a29ab9a8061f654ea70efc52ac
parent76dc4777536e9d330a7c3caeadf312148964fdbd
parente117aca35481fc6619d59f86c4966fa167e121e7
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_evaluation-topbar-tpa

bzr revid: apa@tinyerp.com-20120426100230-5asz2f3lteg1mrkw