[Pkg-owncloud-commits] [php-sabredav] 26/34: Merge branch '2.1'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 3.0.0-beta1
in repository php-sabredav.

commit 6a5bbbf8831c33481616d02779b2fd78baedadb6
Merge: ed400c5 fc09808
Author: Evert Pot <me at evertpot.com>
Date:   Mon May 25 18:46:21 2015 -0400

    Merge branch '2.1'

 CHANGELOG.md                   | 2 ++
 lib/CalDAV/Schedule/Plugin.php | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)


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