[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)
commit4ca6502d5e234044463cf714e3ca55095d45d3bb
tree3a15450f9f2a6165b084b685cd489f332eec29ba
parent4a1208b39bdb5866ea8fcc1419969bdb7255e199
parent751eb333bc46029be5e54f934d28343772160265
[MERGE] Merge with trunk

bzr revid: jke@openerp.com-20131219193521-gs6ty1p0uju8cc21
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_view.xml