Merge proposals dependent on lp:~dangarner/xibo/server-160-rc2-final

lp:~dangarner/xibo/server-160-rc2-final has no merge proposals.