[MERGE] forward port of branch saas-3 up to 2c1bcfb
authorChristophe Simonis <chs@odoo.com>
Thu, 23 Oct 2014 14:52:37 +0000 (16:52 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 23 Oct 2014 14:52:37 +0000 (16:52 +0200)
1  2 
addons/calendar/calendar.py
addons/crm_partner_assign/crm_portal_view.xml

Simple merge