[california/wip/732671-double: 5/5] Merge branch 'master' into wip/732671-double

[Jim Nelson <jnelson src gnome org>]

commit 9bda6f6bc8422759777801a3efb1b6854902df23
Merge: 9ae2eb2 5f59e4a
Author: Jim Nelson <jim yorba org>
Date:   Fri Sep 5 18:18:27 2014 -0700

    Merge branch 'master' into wip/732671-double

 po/POTFILES.in                               |    1 +
 po/POTFILES.skip                             |    1 +
 src/activator/activator.vala                 |    2 +-
 src/calendar/calendar-date.vala              |   13 +-
 src/calendar/calendar-day-of-week.vala       |   21 ++
 src/collection/collection.vala               |   16 ++
 src/component/component-recurrence-rule.vala |  321 +++++++++++++++++++++++++-
 src/host/host-create-update-event.vala       |   14 ++
 src/host/host-create-update-recurring.vala   |   54 ++++-
 src/host/host-show-event.vala                |   11 +
 src/rc/create-update-event.ui                |   98 ++++++--
 src/rc/create-update-recurring.ui            |   27 ++-
 src/rc/show-event.ui                         |   25 ++-
 13 files changed, 560 insertions(+), 44 deletions(-)
---