[MERGE] Merge with trunk
authorjke-openerp <jke@openerp.com>
Thu, 19 Dec 2013 19:35:21 +0000 (20:35 +0100)
committerjke-openerp <jke@openerp.com>
Thu, 19 Dec 2013 19:35:21 +0000 (20:35 +0100)
bzr revid: jke@openerp.com-20131219193521-gs6ty1p0uju8cc21

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

Simple merge