[Pkg-owncloud-commits] [php-sabredav] 13/148: Merge branch 'master' into xml-rewrite2

[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 f54207626281b37c2c2202cfd14015e4a5897394
Merge: b2cd09d 10af5c9
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 12 15:15:05 2015 -0500

    Merge branch 'master' into xml-rewrite2

 ChangeLog.md                                       | 14 ++++++
 lib/CalDAV/Backend/AbstractBackend.php             |  5 ++
 lib/CalDAV/Schedule/IMipPlugin.php                 |  9 +---
 lib/CalDAV/Schedule/Plugin.php                     |  4 +-
 lib/DAV/Auth/Backend/AbstractBasic.php             |  6 ++-
 lib/DAV/Auth/Backend/AbstractDigest.php            |  6 ++-
 lib/DAV/Auth/Backend/Apache.php                    |  6 ++-
 lib/DAV/Auth/Backend/BackendInterface.php          |  6 ++-
 lib/DAV/Auth/Plugin.php                            |  2 +-
 lib/DAV/Version.php                                |  2 +-
 tests/Sabre/CalDAV/Backend/AbstractTest.php        | 54 ++++++++++++++++------
 .../Sabre/CalDAV/Schedule/DeliverNewEventTest.php  |  2 +-
 .../Sabre/CalDAV/Schedule/ScheduleDeliverTest.php  | 18 ++++----
 tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php |  2 +-
 .../Sabre/DAV/Auth/Backend/AbstractDigestTest.php  |  2 +-
 tests/Sabre/DAV/Auth/Backend/ApacheTest.php        |  2 +-
 tests/Sabre/DAV/Auth/Backend/Mock.php              |  2 +-
 17 files changed, 95 insertions(+), 47 deletions(-)


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