[MERGE] merge from master

diff --cc addons/project/project_view.xml
index fc6ffe6,693e1b4..9bbd078
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -29,9 -29,11 +29,11 @@@
                          help="Show only tasks having a deadline"/>
                      <field name="partner_id"/>
                      <field name="project_id"/>
+                     <field name="reviewer_id"/>
                      <field name="user_id"/>
                      <field name="stage_id" domain="[]"/>
 -                    <group expand="0" string="Group By...">
 +                    <group expand="0" string="Group By">
+                         <filter string="Reviewers" name="group_reviewer_id" domain="[]"  context="{'group_by':'reviewer_id'}"/>
                          <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                          <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                          <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>

diff --cc openerp/addons/base/ir/ir_model_view.xml
Simple merge