Merge proposals

Raphael Collet (OpenERP) has no merge proposals.