[MERGE] merge with main branch
authorAmit Vora <avo@tinyerp.com>
Wed, 12 Mar 2014 09:07:34 +0000 (14:37 +0530)
committerAmit Vora <avo@tinyerp.com>
Wed, 12 Mar 2014 09:07:34 +0000 (14:37 +0530)
commit55c3d2336a953306a16b8b63f7ecdacd11467612
tree7f58fc28de542b08094ffadc8a7cc8f2d4d4a43e
parentaef61e129388e2e2a2fd5a707c6920e30e892e03
parent66c594fe6d145eb41abff14fd12239734707b22c
[MERGE] merge with main branch

bzr revid: avo@tinyerp.com-20140312090734-1m11cnuavrgl92it
addons/calendar/calendar.py
addons/crm/crm_lead.py
addons/crm/crm_phonecall_menu.xml
addons/crm/crm_phonecall_view.xml