OpenERP Community Backports (Web)

Merge proposals dependent on lp://staging/~camptocamp/ocb-web/7.0-fix_1190236_opw-595981-msh

  1. 7.0-fix_1190236_opw-595981-msh
  2. Dependent merge proposals

lp://staging/~camptocamp/ocb-web/7.0-fix_1190236_opw-595981-msh has no merge proposals.