[Pkg-owncloud-commits] [php-sabredav] 23/66: 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 branch master
in repository php-sabredav.

commit b46af99c97d409001e577cadc38e54ac407ef6d2
Merge: 5400736 2f647cb
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sun Dec 8 15:06:04 2013 -0500

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

 examples/calendarserver.php                 | 24 ++++++++++++------------
 lib/Sabre/CalDAV/Backend/PDO.php            | 24 +++++++++++++++++-------
 lib/Sabre/CalDAV/UserCalendars.php          |  2 +-
 lib/Sabre/CardDAV/Backend/PDO.php           |  6 +++---
 lib/Sabre/DAV/Auth/Backend/PDO.php          |  8 ++------
 lib/Sabre/DAV/Exception/ConflictingLock.php |  1 -
 lib/Sabre/DAV/Sync/Plugin.php               |  2 +-
 tests/bootstrap.php                         |  2 --
 8 files changed, 36 insertions(+), 33 deletions(-)

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