[Pkg-owncloud-commits] [php-sabredav] 110/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 1af7c84e9ed57ded6bd9ff3117ecb4c4b5e09cfa
Merge: e031322 ddbcb99
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jul 28 15:36:32 2014 -0400

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

 ChangeLog.md                     |  5 ++++-
 lib/DAV/Browser/Plugin.php       | 37 +++++++++++++++++++++++++++++++++++--
 lib/DAV/PropFind.php             | 24 +++++++++++++++---------
 tests/Sabre/DAV/PropFindTest.php | 11 +++++++++++
 4 files changed, 65 insertions(+), 12 deletions(-)

diff --cc ChangeLog.md
index 92c677c,4bb9eb2..2ceff60
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -10,14 -10,11 +10,17 @@@ ChangeLo
  * Changed: Restructured the zip distribution to be a little bit more lean
    and consistent.
  * #472: Always returning lock tokens in the lockdiscovery property.
- 
+ * Directory entries in the Browser plugin are sorted by type and name.
+   (@aklomp)
+ * #486: It's now possible to return additional properties when an 'allprop'
+   PROPFIND request is being done. (@aklomp)
  
 +2.0.4 (????-??-??)
 +------------------
 +
 +* #483: typo in calendars creation for PostgreSQL.
 +
 +
  2.0.3 (2014-07-14)
  ------------------
  

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