Merge proposals dependent on lp:~gmpc-trunk/gmpc/gmpc-avahi

lp:~gmpc-trunk/gmpc/gmpc-avahi has no merge proposals.