[MERGE] with trunk

author Foram Katharotiya (OpenERP) <fka@tinyerp.com>

Fri, 14 Jun 2013 11:53:39 +0000 (17:23 +0530)

committer Foram Katharotiya (OpenERP) <fka@tinyerp.com>

Fri, 14 Jun 2013 11:53:39 +0000 (17:23 +0530)
author Foram Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 14 Jun 2013 11:53:39 +0000 (17:23 +0530)
committer Foram Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 14 Jun 2013 11:53:39 +0000 (17:23 +0530)
diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/account/project/project_view.xml
Simple merge
diff --cc addons/account_budget/account_budget_view.xml
Simple merge
diff --cc addons/document_page/document_page_view.xml
Simple merge
diff --cc addons/hr_evaluation/hr_evaluation_view.xml
Simple merge
diff --cc addons/hr_expense/hr_expense_view.xml
Simple merge
diff --cc addons/mrp/mrp_view.xml
Simple merge
diff --cc addons/survey/survey_view.xml
Simple merge
author	Foram Katharotiya (OpenERP) <fka@tinyerp.com>
	Fri, 14 Jun 2013 11:53:39 +0000 (17:23 +0530)
committer	Foram Katharotiya (OpenERP) <fka@tinyerp.com>
	Fri, 14 Jun 2013 11:53:39 +0000 (17:23 +0530)
		1	2
addons/account/account_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/project/project_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_budget/account_budget_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/document_page/document_page_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_evaluation/hr_evaluation_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/survey/survey_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history