[Pkg-owncloud-commits] [php-sabredav] 07/42: 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 458b7cc633e50a4ea233c245c6f1288051f075f0
Merge: 8115923 ad1c56f
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sun Sep 28 16:37:19 2014 +0100

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

 examples/sql/mysql.calendars.sql       | 0
 lib/CalDAV/Schedule/IInbox.php         | 2 +-
 lib/CalDAV/UserCalendars.php           | 2 +-
 lib/DAV/Exception/InvalidSyncToken.php | 4 ++--
 lib/DAV/PartialUpdate/Plugin.php       | 2 +-
 lib/DAV/URLUtil.php                    | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

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