[Pkg-owncloud-commits] [php-sabredav] 91/220: Merge remote-tracking branch 'origin/master' into sharing-take-2

[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 b15bb8c47895c7499bb293861938abe0766022f1
Merge: 74b2478 7009256
Author: Evert Pot <me at evertpot.com>
Date:   Wed Mar 23 00:07:25 2016 -0400

    Merge remote-tracking branch 'origin/master' into sharing-take-2

 CHANGELOG.md                                   |  3 ++
 lib/CalDAV/Plugin.php                          | 10 ++--
 lib/CalDAV/Schedule/Plugin.php                 |  7 +--
 lib/CalDAV/SharingPlugin.php                   |  3 +-
 lib/CalDAV/Subscriptions/Subscription.php      |  2 +-
 lib/CardDAV/Plugin.php                         |  6 +--
 lib/DAV/Xml/Property/Href.php                  | 17 ++-----
 lib/DAV/Xml/Property/LocalHref.php             | 48 ++++++++++++++++++
 tests/Sabre/DAV/Xml/Property/HrefTest.php      | 29 -----------
 tests/Sabre/DAV/Xml/Property/LocalHrefTest.php | 69 ++++++++++++++++++++++++++
 tests/bootstrap.php                            | 12 ++---
 11 files changed, 144 insertions(+), 62 deletions(-)


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