[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)
bzr revid: rco@openerp.com-20120614143107-rtnb6tzd6a5hlwm8

1  2 
addons/hr/hr.py
addons/hr/hr_view.xml
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_view.xml

diff --cc addons/hr/hr.py
Simple merge
Simple merge
Simple merge