[Pkg-owncloud-commits] [php-sabredav] 88/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 380d6cea83e657a5fd5a89bed126418ec8742f78
Merge: 3e5492f 468a618
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jul 14 18:13:16 2014 -0400

    Merge branch '2.0'
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md                     | 4 +++-
 bin/migrateto20.php              | 2 +-
 examples/sql/mysql.calendars.sql | 2 +-
 examples/sql/pgsql.calendars.sql | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --cc ChangeLog.md
index 3f68c22,eeb64ea..b26e459
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,18 -1,7 +1,18 @@@
  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.
 +* #472: Always returning lock tokens in the lockdiscovery property.
 +
 +
- 2.0.3 (????-??-??)
+ 2.0.3 (2014-07-14)
  ------------------
  
  * #474: Fixed PropertyStorage `pathFilter()`.

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