[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20131126124206-gw02bnwnerl5dzrv

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

diff --cc addons/hr/hr_view.xml
Simple merge

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

diff --cc addons/hr_recruitment/hr_recruitment_data.xml
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
Simple merge

diff --cc addons/mail/mail_alias.py
Simple merge

diff --cc addons/mail/mail_thread.py
Simple merge