[MERGE] branch merged with trunk-improve_default_filter_project-jap

author Meera Trambadia (OpenERP) <mtr@tinyerp.com>

Fri, 2 Mar 2012 08:54:25 +0000 (14:24 +0530)

committer Meera Trambadia (OpenERP) <mtr@tinyerp.com>

Fri, 2 Mar 2012 08:54:25 +0000 (14:24 +0530)
author Meera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 2 Mar 2012 08:54:25 +0000 (14:24 +0530)
committer Meera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 2 Mar 2012 08:54:25 +0000 (14:24 +0530)
diff --cc addons/project/project_view.xml
Simple merge
diff --cc addons/project_issue/project_issue_menu.xml
Simple merge
diff --cc addons/project_long_term/project_long_term_view.xml
Simple merge
diff --cc addons/project_scrum/project_scrum_view.xml
Simple merge
diff --cc addons/project_timesheet/project_timesheet_view.xml
Simple merge
author	Meera Trambadia (OpenERP) <mtr@tinyerp.com>
	Fri, 2 Mar 2012 08:54:25 +0000 (14:24 +0530)
committer	Meera Trambadia (OpenERP) <mtr@tinyerp.com>
	Fri, 2 Mar 2012 08:54:25 +0000 (14:24 +0530)
		1	2
addons/project/project_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue_menu.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/project_long_term/project_long_term_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/project_scrum/project_scrum_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/project_timesheet/project_timesheet_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history