[Pkg-owncloud-commits] [owncloud] 06/08: Merge tag 'upstream/7.0.9_dfsg'

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 5b0414c20297946aec64279e6f96ae27147a35ad
Merge: da5523e a9f020a
Author: David Prévot <taffit at debian.org>
Date:   Wed Sep 2 05:46:47 2015 -0400

    Merge tag 'upstream/7.0.9_dfsg'
    
    Upstream version 7.0.9~dfsg
    
    # gpg: Signature made mer. 02 sept. 2015 05:29:24 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

 apps/documents/appinfo/version                     |  2 +-
 apps/files_sharing/lib/updater.php                 |  4 +-
 apps/files_sharing/tests/updater.php               | 44 ++++++++++++++++++----
 .../_sources/configuration/user_auth_ldap.txt      |  5 ++-
 .../release/configuration/user_auth_ldap.html      | 10 ++---
 version.php                                        |  8 ++--
 6 files changed, 50 insertions(+), 23 deletions(-)

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