[MERGE] Merged with main addons
authorThibault Delavallée <tde@openerp.com>
Mon, 30 Apr 2012 08:21:39 +0000 (10:21 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 30 Apr 2012 08:21:39 +0000 (10:21 +0200)
commit5caa26fa268d39403bb71474ecf8f5c829433dbe
tree1b913d419c99c4a8ae302b9adbb292109c4cf43d
parentc4addb4d5ac05ae39e64a8cad460a22d159e9859
parent41a69ec95df4a039fb95241522fe996a103e142b
[MERGE] Merged with main addons

bzr revid: tde@openerp.com-20120430082139-p0q9c33x63dnsul1
addons/hr_holidays/hr_holidays.py
addons/mail/mail_message_view.xml