[Pkg-owncloud-commits] [php-sabredav] 113/163: Merge branch 'master' into propfind-refactor

[David Prévot]

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

taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.

commit 85963060fdb7df433d36e40ad1cd832420712d22
Merge: b5f0a10 388a651
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sat May 3 14:26:04 2014 -0400

    Merge branch 'master' into propfind-refactor

 .gitignore  | 1 +
 .travis.yml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

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