[california/wip/725767-week: 2/2] Merge branch 'master' into wip/725767-week

[Jim Nelson <jnelson src gnome org>]

commit 9fd296d52b0c6feadece78bad8df7c51200675b5
Merge: 4d51f55 e06c5cf
Author: Jim Nelson <jim yorba org>
Date:   Fri May 9 18:13:16 2014 -0700

    Merge branch 'master' into wip/725767-week

 .../backing-calendar-subscription-manager.vala     |   13 +++++++
 .../backing-eds-calendar-source-subscription.vala  |   26 ++++++++++++-
 src/component/component-event.vala                 |   22 -----------
 src/component/component-uid.vala                   |    4 +-
 src/view/month/month-grid.vala                     |   38 +++++++++++++-------
 5 files changed, 64 insertions(+), 39 deletions(-)
---