Merge proposals dependent on lp:~mariob/ubuntu-calendar-app/coding_conventions

lp:~mariob/ubuntu-calendar-app/coding_conventions has no merge proposals.