Merge proposals

Ravi Gohil (OpenERP) has no merge proposals.