Merge proposals dependent on lp:~mutse-young/chinese-calendar/trunk

lp:~mutse-young/chinese-calendar/trunk has no merge proposals.