[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 09:37:26 +0000 (15:07 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 09:37:26 +0000 (15:07 +0530)
commitf304131b1060638c1ac3901e0cca1e18023ec1e6
tree372ba59811d9d408f6afa468366f77a90e48d50e
parent405af3cf685db46c396a58bf1ba27dbe138f472e
parent5e1d4c0111a171403b8c8fdf68ef863167018e11
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr-topbar-tpa

bzr revid: apa@tinyerp.com-20120426093726-wpq9jn9tau5ptnc6