[Pkg-owncloud-commits] [php-sabredav] 10/31: Merge branch '1.8' into 2.0

[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 442603b5913ea56fee7b14e1853d54cbf7df82b2
Merge: 1187863 ae817b7
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Aug 7 15:10:27 2014 -0400

    Merge branch '1.8' into 2.0
    
    Conflicts:
    	tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
    	tests/composer.vobject3.json

 tests/Sabre/CalDAV/Backend/AbstractPDOTest.php    |  4 +-
 tests/Sabre/CalDAV/CalendarQueryValidatorTest.php | 48 ++++++++++++-----------
 2 files changed, 28 insertions(+), 24 deletions(-)


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