Merge proposals dependent on lp://staging/~jseutter/charms/precise/haproxy/errorfiles-remix

lp://staging/~jseutter/charms/precise/haproxy/errorfiles-remix has no merge proposals.