Merge proposals dependent on lp:~armagetronad-ct/armagetronad/trunk-armagetronad-camview

lp:~armagetronad-ct/armagetronad/trunk-armagetronad-camview has no merge proposals.