[Pkg-owncloud-commits] [php-sabredav] 06/220: Merge branch '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 8232b55d071d16e3280450de0040b7f0c494cb4d
Merge: da98db6 5266b3a
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jul 28 17:42:31 2015 -0400

    Merge branch 'master' into sharing-take-2

 CHANGELOG.md                              | 20 +++++++++--
 lib/CalDAV/Backend/AbstractBackend.php    |  7 +++-
 lib/CalDAV/Backend/PDO.php                |  3 ++
 lib/CalDAV/ICSExportPlugin.php            |  9 +++--
 lib/CalDAV/Plugin.php                     | 23 ++++++++++++-
 lib/CalDAV/Schedule/Inbox.php             | 15 +++------
 lib/CalDAV/Schedule/Plugin.php            | 13 ++++++++
 lib/CardDAV/Plugin.php                    | 31 +++++++++++++----
 lib/CardDAV/VCFExportPlugin.php           |  7 ++--
 lib/DAV/Version.php                       |  2 +-
 tests/Sabre/CalDAV/PluginTest.php         |  1 +
 tests/Sabre/CalDAV/Schedule/InboxTest.php | 55 +++++++++++++------------------
 12 files changed, 128 insertions(+), 58 deletions(-)

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