[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 26 Nov 2013 12:42:06 +0000 (18:12 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 26 Nov 2013 12:42:06 +0000 (18:12 +0530)
commit982549b31af8a4524ab19ccbf4a2e633f6e9132b
tree911ac18453e1de2e27cef52b61201841cc57f360
parentc90fe3d7a60343d95326245f91d4d6f9c9db4f89
parentbb1e256f5b24bb4fc4b64e1fa973f86a30e4bace
[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20131126124206-gw02bnwnerl5dzrv
addons/hr/hr.py
addons/hr/hr_view.xml
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_data.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/mail/mail_alias.py
addons/mail/mail_thread.py