Odoo Web (MOVED TO GITHUB)

Merge proposals dependent on lp://staging/~therp-nl/openerp-web/7.0-lp1318179-get_file_parse_error

  1. 7.0-lp1318179-get_file_parse_error
  2. Dependent merge proposals

lp://staging/~therp-nl/openerp-web/7.0-lp1318179-get_file_parse_error has no merge proposals.