Merge proposals dependent on lp:~popey/ubuntu-calendar-app/fix-illogical-tests

lp:~popey/ubuntu-calendar-app/fix-illogical-tests has no merge proposals.