[Pkg-owncloud-commits] [php-sabredav] 16/19: Merge branch '2.1' into 3.0

[David Prévot]

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

taffit pushed a commit to tag 3.0.6
in repository php-sabredav.

commit 5046caace606f8756689a9fe3ec71b3d5e00757a
Merge: b0c8294 2307cd6
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 4 14:35:17 2016 -0500

    Merge branch '2.1' into 3.0

 CHANGELOG.md        | 1 +
 bin/migrateto20.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)


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