[Pkg-owncloud-commits] [php-sabredav] 19/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 dfb52aa27873cee545a7314b85ac300a381b246d
Merge: 0d5ee76 9efd7a8
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue Sep 17 21:20:54 2013 +0100

    Merge branch 'master' into calendar-auto-schedule

 ChangeLog                                  |   2 +
 composer.json                              |   2 +-
 lib/Sabre/CalDAV/CalendarObject.php        |   2 +-
 lib/Sabre/CalDAV/ICSExportPlugin.php       | 179 +++++++++++++---
 lib/Sabre/CardDAV/VCFExportPlugin.php      |   3 -
 tests/Sabre/CalDAV/ICSExportPluginTest.php | 317 ++++++++++++++++++++++++++++-
 6 files changed, 461 insertions(+), 44 deletions(-)

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