[Pkg-owncloud-commits] [php-sabredav] 150/220: Merge branch 'master' into default-acl

[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 bfb3c999697d8df57eb72d59fb9e3cb6108fcc4a
Merge: adaadd3 ae98b70
Author: Evert Pot <me at evertpot.com>
Date:   Mon Apr 11 18:38:11 2016 +0900

    Merge branch 'master' into default-acl

 CHANGELOG.md                          |  2 +-
 lib/CardDAV/VCFExportPlugin.php       | 28 +++++++++++++++++++----
 tests/Sabre/CardDAV/VCFExportTest.php | 43 +++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 5 deletions(-)

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