[Pkg-owncloud-commits] [php-sabredav] 34/275: Merge branch 'master' into calendar-auto-schedule

[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 96cb0ae3dda03a7c80abf97dc4b007ce0527f284
Merge: c060fe8 09e1a8a
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Jan 9 18:32:18 2014 -0500

    Merge branch 'master' into calendar-auto-schedule

 ChangeLog                | 4 +++-
 composer.json            | 2 +-
 lib/Sabre/DAV/Server.php | 7 -------
 3 files changed, 4 insertions(+), 9 deletions(-)

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