[Pkg-owncloud-commits] [php-sabredav] 47/66: Merge branch 'master' into acl-fs

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 3.0.0-alpha1
in repository php-sabredav.

commit 4e7ea2beae0e294d4c3440efe69d36718744ba0b
Merge: 67e838c ad31e59
Author: Evert Pot <me at evertpot.com>
Date:   Wed Apr 29 16:34:09 2015 -0400

    Merge branch 'master' into acl-fs

 CHANGELOG.md                                       |   2 +
 lib/DAV/Browser/HtmlOutput.php                     |  34 ++++++
 lib/DAV/Browser/HtmlOutputHelper.php               | 117 +++++++++++++++++++
 lib/DAV/Browser/Plugin.php                         | 129 +++++----------------
 lib/DAV/Xml/Property/Href.php                      |  35 +++++-
 lib/DAV/Xml/Property/ResourceType.php              |  27 ++++-
 lib/DAV/Xml/Property/SupportedMethodSet.php        |  34 +++++-
 lib/DAV/Xml/Property/SupportedReportSet.php        |  27 ++++-
 lib/DAVACL/Xml/Property/Acl.php                    |  53 ++++++++-
 .../Xml/Property/CurrentUserPrivilegeSet.php       |  28 ++++-
 lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php  |  49 +++++++-
 tests/Sabre/DAV/Xml/Property/HrefTest.php          |  28 ++++-
 tests/Sabre/DAVACL/Xml/Property/ACLTest.php        |  56 +++++++--
 .../Xml/Property/CurrentUserPrivilegeSetTest.php   |  21 +++-
 .../Xml/Property/SupportedPrivilegeSetTest.php     |  35 ++++++
 15 files changed, 541 insertions(+), 134 deletions(-)

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