Merge proposals dependent on lp:~neon/kteatime/master

lp:~neon/kteatime/master has no merge proposals.