[MERGE]merge with trunk
authorPrashant Panchal (OpenERP) <ppa@tinyerp.com>
Tue, 6 May 2014 10:08:12 +0000 (15:38 +0530)
committerPrashant Panchal (OpenERP) <ppa@tinyerp.com>
Tue, 6 May 2014 10:08:12 +0000 (15:38 +0530)
commit10beeb53ede95800f649f05449acc47f06b78454
treee968e0bcbbc0b1bdd3c11d9fd899010b9cef5c58
parenta3e44373d092c0c7ef634b7f104ac9a385ac946a
[MERGE]merge with trunk
addons/sale_team/res_config_view.xml