OpenERP Community Backports (Addons)

Merge proposals dependent on lp://staging/~hirt/ocb-addons/6.1_calendar_fix_id2real_id

  1. 6.1_calendar_fix_id2real_id
  2. Dependent merge proposals

lp://staging/~hirt/ocb-addons/6.1_calendar_fix_id2real_id has no merge proposals.