[Pkg-owncloud-commits] [php-sabredav] 75/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 e8183c39852c48ca2dfb51c3b16808acdcada6db
Merge: a750345 e061cca
Author: Evert Pot <me at evertpot.com>
Date:   Thu Jun 26 11:40:53 2014 -0400

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

 ChangeLog.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --cc ChangeLog.md
index 98dcb2a,a6f905e..8de9b80
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,16 -1,12 +1,22 @@@
  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
 +* Changed: Restructured the zip distribution to be a little bit more lean
 +  and consistent.
 +
 +
+ 2.0.3 (????-??-??)
+ ------------------
+ 
+ * #474: Fixed PropertyStorage `pathFilter()`.
+ 
+ 
  2.0.2 (2014-06-12)
  ------------------
  
@@@ -22,10 -18,8 +28,9 @@@
  * Removed: Old and broken example code from the `examples/` directory.
  * The zip release ships with [sabre/vobject 3.2.3][vobj],
    [sabre/http 2.0.3][http], and [sabre/event 1.0.1][evnt].
- * #474: Fixed PropertyStorage `pathFilter()`.
  
  
 +
  2.0.1 (2014-05-28)
  ------------------
  

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