OpenERP Server (project parking)

Merge proposals dependent on lp://staging/~openerp-dev/openerp-server/trunk-partnerimages-niv

  1. trunk-partnerimages-niv
  2. Dependent merge proposals

lp://staging/~openerp-dev/openerp-server/trunk-partnerimages-niv has no merge proposals.