[Pkg-owncloud-commits] [php-sabredav] 56/275: Merge branch '2.0'

[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 056b70818ab5b71a01a06b43a07e768986d48c65
Merge: 2e8a479 a98c163
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jun 2 17:37:04 2014 -0400

    Merge branch '2.0'
    
    Conflicts:
    	ChangeLog.md
    	lib/DAV/Version.php

 ChangeLog.md                     | 16 +++++++++++++++-
 lib/DAV/PropFind.php             |  2 ++
 tests/Sabre/DAV/PropFindTest.php |  9 ---------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --cc ChangeLog.md
index 974476e,8dd11f4..519ad87
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,17 -1,21 +1,31 @@@
  ChangeLog
  =========
  
 +2.1.0-alpha1 (2014-??-??)
 +-------------------------
++
 +* Changed: PropertyStorage backends now have a `move` method.
 +* Added: `beforeMove`, and `afterMove` events.
 +* #460: PropertyStorage must move properties during MOVE requests
 +
- 2.0.1 (2014-??-??)
++
+ 2.0.2 (2014-05-??)
+ ------------------
+ 
+ * #467: Fixed a problem in `examples/calendarserver.php`.
+ * #466: All the postgresql sample files have been updated.
+ 
++
+ 2.0.1 (2014-05-28)
+ ------------------
+ 
  * #459: PROPFIND requests on Files with no Depth header would return a fatal
    error.
+ * #464: A PROPFIND allprops request should not return properties with status
+   404.
+ 
  
 +
  2.0.0 (2014-05-22)
  ------------------
  

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