Merge proposals dependent on lp://staging/haguichi/1.0

lp://staging/haguichi/1.0 has no merge proposals.