[Pkg-owncloud-commits] [php-sabredav] 25/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 c809d3665fab29b543ddcaa01bc855d146949380
Merge: 6f26532 55bcbb3
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue Sep 24 11:43:14 2013 +0200

    Merge branch 'master' into calendar-auto-schedule

 ChangeLog                                          |  2 +
 lib/Sabre/CalDAV/ICSExportPlugin.php               |  2 +-
 lib/Sabre/CalDAV/Plugin.php                        | 94 +++++++++++++++++++---
 .../CalDAV/Property/SupportedCalendarData.php      |  4 +
 lib/Sabre/DAV/Server.php                           |  4 +-
 .../CalDAV/Property/SupportedCalendarDataTest.php  |  1 +
 6 files changed, 91 insertions(+), 16 deletions(-)


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