[Pkg-owncloud-commits] [php-sabredav] 05/07: Merge tag 'upstream/2.1.5' 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 8fd1d01e68c0dcbe4ba2d2792122dd3a72c69a95
Merge: 3f38212 ea03c52
Author: David Prévot <taffit at debian.org>
Date:   Sat Jul 11 17:35:01 2015 -0400

    Merge tag 'upstream/2.1.5' into 2.1
    
    Upstream version 2.1.5
    
    # gpg: Signature made sam. 11 juil. 2015 17:34:53 AST
    # 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        | 18 ++++++++++++++++++
 lib/DAV/Server.php  |  2 +-
 lib/DAV/Version.php |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

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