Bazaar

Merge proposals dependent on lp://staging/~gagern/bzr/bug638451-resolve-take-other

  1. bug638451-resolve-take-other
  2. Dependent merge proposals

lp://staging/~gagern/bzr/bug638451-resolve-take-other has no merge proposals.