[Pkg-owncloud-commits] [php-sabredav] 07/75: Merge branch '2.1'

[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 8f9bd4e6ada3f0a2a8567e08621763a6b8df61c6
Merge: 10af5c9 4157807
Author: Evert Pot <me at evertpot.com>
Date:   Sat Jan 17 21:58:32 2015 -0500

    Merge branch '2.1'

 ChangeLog.md                                       |  1 +
 lib/CalDAV/ICSExportPlugin.php                     | 19 +++++++++-
 .../Sabre/CalDAV/ExpandEventsFloatingTimeTest.php  | 40 ++++++++++++++++++++++
 tests/Sabre/DAVServerTest.php                      |  5 +++
 4 files changed, 64 insertions(+), 1 deletion(-)


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