[Pkg-owncloud-commits] [owncloud] 04/10: Merge tag 'upstream/8.2.2_dfsg' into stable8

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit a59ce2e974549fc5b8876e4d967f0ee397f5369e
Merge: bd9a099 caef0f4
Author: David Prévot <taffit at debian.org>
Date:   Mon Dec 21 17:07:31 2015 -0400

    Merge tag 'upstream/8.2.2_dfsg' into stable8
    
    Upstream version 8.2.2~dfsg
    
    # gpg: Signature faite le lun. 21 déc. 2015 17:07:02 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 core/doc/admin/_images/wnd-3.jpg                   | Bin 0 -> 47004 bytes
 .../files_locking_transactional.txt                |   2 +-
 .../configuration_server/caching_configuration.txt |   2 +-
 .../_sources/configuration_user/user_auth_ldap.txt |  10 ++++-
 .../windows-network-drive_configuration.txt        |  21 +++++++----
 .../_sources/installation/source_installation.txt  |  33 +++++++++++------
 core/doc/admin/_sources/release_notes.txt          |   2 +
 .../files_locking_transactional.html               |   2 +-
 .../caching_configuration.html                     |   2 +-
 .../admin/configuration_user/user_auth_ldap.html   |   8 +++-
 .../windows-network-drive_configuration.html       |  18 ++++++---
 .../admin/installation/source_installation.html    |  41 ++++++++++++---------
 core/doc/admin/release_notes.html                  |   1 +
 core/skeleton/ownCloud_User_Manual.pdf             | Bin 2544984 -> 0 bytes
 version.php                                        |   8 ++--
 15 files changed, 95 insertions(+), 55 deletions(-)

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