[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_expance-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 09:51:50 +0000 (15:21 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 09:51:50 +0000 (15:21 +0530)
commit76dc4777536e9d330a7c3caeadf312148964fdbd
tree73ba0d8c5c755f029c08f9cd8544732a4c7635f3
parent71ebe9285cc24a25e5a8a95203986ab2b12c9ff6
parentb22f46a8f9282f77351ae32e87069ca4c4f6e198
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_expance-topbar-tpa

bzr revid: apa@tinyerp.com-20120426095150-07e8eiteba2u4p5n