[MERGE] forward port of branch saas-2 up to revid 9151 chs@openerp.com-20140314104803...
authorChristophe Simonis <chs@openerp.com>
Fri, 14 Mar 2014 10:57:53 +0000 (11:57 +0100)
committerChristophe Simonis <chs@openerp.com>
Fri, 14 Mar 2014 10:57:53 +0000 (11:57 +0100)
commitb3bb47076b0aaca7d0347d1297bf3665fbee2add
treeb51bb8b6efdbc5e4070f8b0edeed9f46427f035b
parent477a87e2b1127011bd41b6c05342b9163638ddf6
parent02459f8d4a97ef8ee82464389b269fafac7fec21
[MERGE] forward port of branch saas-2 up to revid 9151 chs@openerp.com-20140314104803-19c5snl2fcuih91o

bzr revid: chs@openerp.com-20140314105753-7a7wh9a1z99azgfj
addons/calendar/calendar.py
addons/mail/mail_thread.py