[Pkg-owncloud-commits] [php-sabredav] 153/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 77185dadf133706e765dc1a2a4c77e68ec10e399
Merge: 02f85ed 1e181bc
Author: Evert Pot <me at evertpot.com>
Date:   Wed Aug 13 15:50:23 2014 -0400

    Merge branch 'master' into calendar-auto-schedule
    
    Conflicts:
    	composer.json

 ChangeLog.md           | 3 +++
 lib/CardDAV/Plugin.php | 7 +++++--
 tests/phpunit.xml      | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

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