[MERGE] trunk
authorAntonin Bourguignon <abo@openerp.com>
Tue, 30 Oct 2012 15:46:47 +0000 (16:46 +0100)
committerAntonin Bourguignon <abo@openerp.com>
Tue, 30 Oct 2012 15:46:47 +0000 (16:46 +0100)
commit5be9d20a0bb33cc7d85bf26ade2628f8affbbdfd
tree10cfc4c9f9de428aede7ad533222d5261730b5c4
parent614768508725c766e37702ff0fa3b47c411b680d
parent87d3caa50f8598eda05b1638edf46491ef01d27a
[MERGE] trunk

bzr revid: abo@openerp.com-20121030154647-6acbljvitcmphriz
addons/hr_expense/hr_expense_view.xml
addons/hr_holidays/hr_holidays_view.xml
addons/hr_recruitment/hr_recruitment_view.xml