[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Fri, 6 Jul 2012 09:52:07 +0000 (11:52 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Fri, 6 Jul 2012 09:52:07 +0000 (11:52 +0200)
commite331988bf1225e4123a19e024752564bcd133dea
treed8757b03ab3bfae3cddc613c394052ffb908a8eb
parent23aeb705be5a3a9f3533420f3a23b0d40ca538cf
parent84c6ee9a3b4763e8130e82ce7684c19a0a9522fa
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120706095207-6l2roojec1osazgi
addons/hr/hr_view.xml
addons/mail/static/src/xml/mail.xml
addons/portal_hr_employees/__openerp__.py