[Pkg-owncloud-commits] [php-sabredav] 27/36: 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 7a928ee7e51977e2d33bcba35ac718ed61e795ff
Merge: ca91f5a cc41c52
Author: Evert Pot <me at evertpot.com>
Date:   Sun Jul 19 19:03:31 2015 -0400

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

 CHANGELOG.md                                       |   3 +
 lib/CalDAV/Schedule/Plugin.php                     |  27 ++-
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  | 246 ++++++++++++++++++---
 tests/Sabre/CalDAV/Schedule/PluginBasicTest.php    |   6 +-
 4 files changed, 248 insertions(+), 34 deletions(-)

diff --cc CHANGELOG.md
index dc16d0d,40b102d..821d0c5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -7,7 -7,8 +7,9 @@@ ChangeLo
  * Now requires PHP 5.5
  * Upgraded to vobject 4, which is a lot faster.
  * Support for PHP 7.
+ * #690: Support for `calendar-availability`, draft 05.
+   [reference][calendar-availability].
 +* #691: Workaround for broken Windows Phone client.
  
  
  3.0.2 (2015-??-??)

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