[Pkg-owncloud-commits] [php-sabredav] 15/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 14b85ff4e4d94eb20612667c7160b3c7c3daf48b
Merge: 2b2864d 008e10e
Author: Evert Pot <me at evertpot.com>
Date:   Tue Aug 11 15:12:13 2015 -0400

    Merge branch 'master' into sharing-take-2

 CHANGELOG.md                                    | 16 ++++
 examples/addressbookserver.php                  |  2 +-
 examples/calendarserver.php                     |  2 +-
 examples/fileserver.php                         |  2 +-
 examples/groupwareserver.php                    |  2 +-
 lib/DAV/Auth/Plugin.php                         | 17 +++++
 lib/DAV/Locks/Backend/PDO.php                   |  2 +-
 lib/DAV/PropertyStorage/Backend/PDO.php         | 19 +++--
 lib/DAV/Xml/Request/PropPatch.php               |  8 +-
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php |  8 +-
 tests/Sabre/DAV/HttpGetTest.php                 | 43 +----------
 tests/Sabre/DAV/HttpHeadTest.php                | 97 +++++++++++++++++++++++++
 tests/Sabre/DAV/Xml/Request/PropPatchTest.php   | 16 ++--
 13 files changed, 170 insertions(+), 64 deletions(-)

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