[california/wip/725776-monday: 6/7] Merge branch 'master' into wip/725776-monday

[Jim Nelson <jnelson src gnome org>]

commit bbd132fbaf63ef17387e22ffb67699146cf79d62
Merge: d3d5a94 16a03e8
Author: Jim Nelson <jim yorba org>
Date:   Tue Aug 5 18:53:08 2014 -0700

    Merge branch 'master' into wip/725776-monday

 po/POTFILES.in                                  |    2 +
 po/pl.po                                        |   69 +++--
 src/Makefile.am                                 |    6 +
 src/base/base-object.vala                       |   10 +-
 src/calendar/calendar-date-span.vala            |   24 ++
 src/calendar/calendar-date.vala                 |    2 +
 src/calendar/calendar-exact-time-span.vala      |   60 ++++
 src/calendar/calendar-exact-time.vala           |   21 ++
 src/calendar/calendar-wall-time.vala            |  109 ++++++-
 src/california-resources.xml                    |    6 +
 src/component/component-event.vala              |   47 +---
 src/host/host-create-update-event.vala          |  249 ++++++-----------
 src/host/host-create-update-recurring.vala      |   31 +--
 src/host/host-date-time-widget.vala             |  352 +++++++++++++++++++++++
 src/host/host-event-time-settings.vala          |  197 +++++++++++++
 src/host/host-main-window.vala                  |    8 +-
 src/host/host-quick-create-event.vala           |    7 +-
 src/host/host-show-event.vala                   |    3 +-
 src/rc/create-update-event.ui                   |  315 ++++++++++-----------
 src/rc/create-update-recurring.ui               |    2 -
 src/rc/date-time-widget.ui                      |  250 ++++++++++++++++
 src/rc/event-time-settings.ui                   |  155 ++++++++++
 src/tests/tests-calendar-exact-time.vala        |   63 ++++
 src/tests/tests-calendar-wall-time.vala         |   91 +++++--
 src/tests/tests.vala                            |    1 +
 src/toolkit/toolkit-button-connector.vala       |  148 ++++-------
 src/toolkit/toolkit-button-event.vala           |    4 +-
 src/toolkit/toolkit-card.vala                   |    1 -
 src/toolkit/toolkit-entry-filter-connector.vala |   87 ++++++
 src/view/week/week-day-pane.vala                |    2 +-
 src/view/week/week-grid.vala                    |   26 +-
 31 files changed, 1762 insertions(+), 586 deletions(-)
---