Merge proposals dependent on lp:~joh/alarm-clock/trunk

lp:~joh/alarm-clock/trunk has no merge proposals.