Merge proposals dependent on lp:~cjohnston/summit/bug-647519

lp:~cjohnston/summit/bug-647519 has no merge proposals.