Merge proposals

OpenERP Colombia has no merge proposals.