[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Thu, 19 Dec 2013 14:40:25 +0000 (15:40 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 19 Dec 2013 14:40:25 +0000 (15:40 +0100)
commit31c6c465e299bf517510940bf6dbf21145ecc8ee
treec42e90d6341d628a7c54ac04e48fd70be41615f9
parentda3372eabde2c176b74f351cfcd7ad70296e4485
parent751eb333bc46029be5e54f934d28343772160265
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20131219144025-cu9hxr0ctcmajyrr
addons/document/document.py
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml