[Pkg-owncloud-commits] [php-sabredav] 17/163: 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 annotated tag upstream/2.0.0_beta1
in repository php-sabredav.

commit 2d64b1c8c8c06a8e073dc1cac4276550df79db20
Merge: 77ada3a 74dec7a
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Feb 27 20:05:27 2014 -0500

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

 ChangeLog.md                   | 7 +++++--
 lib/Sabre/DAV/Locks/Plugin.php | 7 +++++++
 lib/Sabre/DAV/XMLUtil.php      | 6 +++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

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