Merge proposals dependent on lp:~eburner/gitso/trunk

lp:~eburner/gitso/trunk has no merge proposals.