Merge proposals

Thibault Delavallée (OpenERP) has no merge proposals.