[Pkg-owncloud-commits] [owncloud] 17/20: Merge tag 'upstream/7.0.8_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 57ac6a16e7113fdf9e511c1425b038c0babf16ad
Merge: 3793fdf 6afea8d
Author: David Prévot <taffit at debian.org>
Date:   Tue Aug 11 17:17:02 2015 +0200

    Merge tag 'upstream/7.0.8_dfsg'
    
    Upstream version 7.0.8~dfsg
    
    # gpg: Signature made mar. 11 août 2015 17:16:20 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

 apps/calendar/lib/app.php                          |   4 +-
 apps/contacts/lib/addressbookprovider.php          |   3 +-
 apps/files_trashbin/lib/trashbin.php               |  16 +-
 apps/user_ldap/lib/user/manager.php                |   4 +-
 apps/user_ldap/tests/user/manager.php              | 316 +++++++++++----------
 core/command/upgrade.php                           |  30 +-
 .../external_storage_configuration.txt             |  14 +-
 .../external_storage_configuration_gui.txt         |  10 +-
 .../server_to_server_configuration.txt             |  25 +-
 .../configuration/user_auth_ftp_smb_imap.txt       |   6 +
 .../_sources/configuration/user_auth_ldap.txt      |   5 +-
 core/doc/admin/release/_sources/index.txt          |  14 +-
 .../_sources/installation/installation_wizard.txt  |  23 +-
 .../installation/selinux_configuration.txt         |  27 +-
 .../_sources/installation/source_installation.txt  |   5 +-
 core/doc/admin/release/_sources/issues/index.txt   |   3 +
 .../admin/release/_sources/maintenance/restore.txt |   5 +-
 .../external_storage_configuration.html            |  16 +-
 .../external_storage_configuration_gui.html        |  10 +-
 .../server_to_server_configuration.html            |  22 +-
 .../configuration/user_auth_ftp_smb_imap.html      |   8 +
 .../release/configuration/user_auth_ldap.html      |   5 +
 core/doc/admin/release/contents.html               |   5 +-
 core/doc/admin/release/index.html                  |  14 +-
 core/doc/admin/release/installation/index.html     |   3 +
 .../release/installation/installation_wizard.html  |  20 +-
 .../installation/selinux_configuration.html        |  25 +-
 .../release/installation/source_installation.html  |   5 +-
 core/doc/admin/release/issues/index.html           |   3 +
 core/doc/admin/release/maintenance/restore.html    |   4 +-
 core/doc/admin/release/objects.inv                 | Bin 342 -> 370 bytes
 lib/private/files/filesystem.php                   |   2 +-
 lib/private/share/hooks.php                        |   4 +-
 lib/private/updater.php                            |   8 +-
 settings/js/users/groups.js                        |   6 +-
 version.php                                        |   6 +-
 36 files changed, 443 insertions(+), 233 deletions(-)

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