[california/wip/734698-agenda: 3/3] Merge branch 'master' into wip/734698-agenda

[Jim Nelson <jnelson src gnome org>]

commit d618c57565d47a764eb3506191d87d87c3100f89
Merge: 7052ee6 44c977a
Author: Jim Nelson <jim yorba org>
Date:   Mon Dec 8 14:52:36 2014 -0800

    Merge branch 'master' into wip/734698-agenda

 src/activator/activator-instance-list.vala         |    2 +-
 .../google/google-calendar-list-pane.vala          |    2 +-
 src/event-editor/event-editor-attendees-card.vala  |    2 +-
 src/host/host-show-event.vala                      |    2 +-
 src/toolkit/toolkit.vala                           |   14 ++++++++++++++
 5 files changed, 18 insertions(+), 4 deletions(-)
---