[MERGE]: Merged with addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Mon, 10 Feb 2014 06:46:42 +0000 (12:16 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Mon, 10 Feb 2014 06:46:42 +0000 (12:16 +0530)
commit403575f272e3d52e352073a0e323669b599ad75a
tree2f70640e0ae905303f2ae924471d1a66a2375fc0
parente2cc289c825460076565a43d08b581b20156319f
parentd8c5a1c4c2a5f3a7f11c66fdbc624485e6485489
[MERGE]: Merged with addons

bzr revid: atp@tinyerp.com-20140210064642-edr5rju09v49dzqg
addons/account/account_bank_statement.py
addons/account_asset/account_asset.py
addons/calendar/calendar_view.xml
addons/crm/crm_phonecall.py
addons/crm/crm_phonecall_menu.xml