[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Thu, 14 Jun 2012 14:31:07 +0000 (16:31 +0200)
committerRaphael Collet <rco@openerp.com>
Thu, 14 Jun 2012 14:31:07 +0000 (16:31 +0200)
commit818db0ef6c544009a2cec9aa26e5f6d98d066cb4
treee0bae0db47da17a9e60c81fba85dac1e897a1774
parentd758dfaedcf75554969fe9c5dc343cf6b67bdc73
parent8c01d7ba59a6efc4d81707ad3260c1836c1aa1e5
[MERGE] from trunk

bzr revid: rco@openerp.com-20120614143107-rtnb6tzd6a5hlwm8
addons/hr/hr.py
addons/hr/hr_view.xml
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_view.xml