[Pkg-owncloud-commits] [php-sabredav] 21/45: Merge branch '2.1'

[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 d44cf05138f35215426136aee76c0300569112cd
Merge: 02a41a3 f0c1368
Author: Evert Pot <me at evertpot.com>
Date:   Thu Dec 18 18:28:16 2014 -0500

    Merge branch '2.1'
    
    Conflicts:
    	.travis.yml

 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


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