[Pkg-owncloud-commits] [php-sabredav] 10/11: Merge tag 'upstream/2.1.6' into 2.1

[David Prévot]

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

taffit pushed a commit to branch 2.1
in repository php-sabredav.

commit 3554f5699e12e44a6c28e8d3e9a523e8cb404dc3
Merge: 50c5840 91332ee
Author: David Prévot <taffit at debian.org>
Date:   Mon Aug 10 16:29:03 2015 +0200

    Merge tag 'upstream/2.1.6' into 2.1
    
    Upstream version 2.1.6
    
    # gpg: Signature made lun. 10 août 2015 16:29:00 CEST
    # gpg:                using RSA key 058C1CF944F6BD3C
    # gpg: Good signature from "David Prévot <david at tilapin.org>"
    # gpg:                 aka "David Prévot <davidp at altern.org>"
    # gpg:                 aka "David Prévot <davidp at no-log.org>"
    # gpg:                 aka "David Prévot <taffit at debian.org>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #      Subkey fingerprint: 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 ChangeLog.md                      | 10 ++++
 bin/build.php                     |  2 +-
 bin/migrateto21.php               |  8 ++--
 lib/CalDAV/Plugin.php             | 14 ++++++
 lib/DAV/Version.php               |  2 +-
 tests/Sabre/CalDAV/PluginTest.php | 99 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 128 insertions(+), 7 deletions(-)

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