[MERGE] trunk
authorAntonin Bourguignon <abo@openerp.com>
Mon, 5 Nov 2012 10:15:38 +0000 (11:15 +0100)
committerAntonin Bourguignon <abo@openerp.com>
Mon, 5 Nov 2012 10:15:38 +0000 (11:15 +0100)
commit602ed5c7ca0ab82ec4081cad161ca473da16b4a3
tree651dad017498a4940873d3cf0e8efe219bceabcd
parentd74d5d394927a8acc2cc3700cbff0cb27ef51f9d
parent29fffbc97d8970513114b7b76763f002aa73e395
[MERGE] trunk

bzr revid: abo@openerp.com-20121105101538-tdgu6bi8vp2lnqru
addons/hr/__openerp__.py
addons/hr_expense/hr_expense_view.xml
addons/hr_holidays/hr_holidays_view.xml
addons/hr_recruitment/hr_recruitment.py