[Pkg-owncloud-commits] [php-sabredav] 08/42: Merge pull request #553 from armin-hackmann/2.1

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit f1cb621fc816f9765b1f1c64f98918b95956c3a5
Merge: 6c6b874 78a1af5
Author: Evert Pot <me at evertpot.com>
Date:   Wed Nov 12 10:48:06 2014 -0500

    Merge pull request #553 from armin-hackmann/2.1
    
    Don't select a shared calendar as schedule-default-calendar-URL, fix for #550

 lib/CalDAV/Schedule/Plugin.php                     |  4 +--
 .../Sabre/CalDAV/Schedule/PluginPropertiesTest.php | 17 +++++++++++++
 ... => PluginPropertiesWithSharedCalendarTest.php} | 29 +++++++++++++++++++++-
 3 files changed, 47 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git