[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)
commited925892b936c926be5bad2b61a8219d1962e6f2
tree60be02dbc0e67947472af06c4db450e9ea8c1490
parent6bd36a861307a46f3e84eadb01f3fdf660e831fc
parent2c1bcfb2c90c2dbe5273e890bad173e2f345bb1b
[MERGE] forward port of branch saas-3 up to 2c1bcfb
addons/calendar/calendar.py
addons/crm_partner_assign/crm_portal_view.xml