[Pkg-owncloud-commits] [php-sabredav] 195/275: Merge branch 'master' of github.com:fruux/sabre-dav

[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 70c1cedff5c02a8799316d52265461e36be28429
Merge: 74a3116 6882630
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue Aug 26 12:49:27 2014 +0200

    Merge branch 'master' of github.com:fruux/sabre-dav

 lib/DAV/CorePlugin.php                             | 104 ++++++++++-----------
 lib/DAV/Server.php                                 |  13 ++-
 tests/Sabre/CalDAV/ICSExportPluginTest.php         |   1 +
 tests/Sabre/CalDAV/ValidateICalTest.php            |   1 +
 tests/Sabre/DAV/Browser/MapGetToPropFindTest.php   |   1 +
 tests/Sabre/DAV/Browser/PluginTest.php             |   4 +
 tests/Sabre/DAV/FSExt/ServerTest.php               |   7 ++
 tests/Sabre/DAV/HttpDeleteTest.php                 |   2 +
 tests/Sabre/DAV/HttpPutTest.php                    |  10 +-
 tests/Sabre/DAV/Locks/PluginTest.php               |   7 +-
 tests/Sabre/DAV/ServerCopyMoveTest.php             |  32 ++++---
 tests/Sabre/DAV/ServerMKCOLTest.php                |  33 ++++---
 tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php   |   1 +
 tests/Sabre/DAV/ServerPropsTest.php                |   4 +-
 tests/Sabre/DAV/ServerRangeTest.php                |   7 ++
 tests/Sabre/DAV/ServerSimpleTest.php               |  11 ++-
 tests/Sabre/DAVACL/ExpandPropertiesTest.php        |   4 +
 tests/Sabre/DAVACL/PrincipalPropertySearchTest.php |   4 +
 .../DAVACL/PrincipalSearchPropertySetTest.php      |   3 +
 19 files changed, 162 insertions(+), 87 deletions(-)

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