OpenERP Community Backports (Server)

Merge proposals dependent on lp://staging/~yann-papouin/ocb-server/7.0-bug-1319285-translation-overwrite-module-update

  1. 7.0-bug-1319285-translation-overwrite-module-update
  2. Dependent merge proposals

lp://staging/~yann-papouin/ocb-server/7.0-bug-1319285-translation-overwrite-module-update has no merge proposals.