[Pkg-owncloud-commits] [owncloud] 11/12: Merge tag 'upstream/7.0.6_rc2_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 645ee0a2a809a23e3b64328fe51f5deab436a4e1
Merge: 1596e84 563b3ea
Author: David Prévot <taffit at debian.org>
Date:   Mon Jun 1 20:54:53 2015 -0400

    Merge tag 'upstream/7.0.6_rc2_dfsg'
    
    Upstream version 7.0.6~rc2~dfsg
    
    # gpg: Signature made lun. 01 juin 2015 20:53:18 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/files/ajax/list.php                            |  2 +-
 apps/files_external/3rdparty/Dropbox/OAuth/Curl.php | 10 ++++++++--
 apps/files_external/3rdparty/smb4php/smb.php        |  5 +++++
 apps/user_ldap/group_ldap.php                       |  2 +-
 lib/private/files/filesystem.php                    |  9 +++++++++
 lib/private/route/router.php                        |  2 ++
 themes/README                                       |  1 -
 version.php                                         |  6 +++---
 8 files changed, 29 insertions(+), 8 deletions(-)

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