[Pkg-owncloud-commits] [owncloud-doc] 18/27: Merge pull request #1397 from RealRancor/backport_1394_stable7

[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-doc.

commit 0fdb4815af6a000e48d5f380045808f480338755
Merge: 346e92b 10d39f9
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Aug 4 14:50:57 2015 -0700

    Merge pull request #1397 from RealRancor/backport_1394_stable7
    
    Backport #1394 to stable7

 admin_manual/configuration/user_auth_ftp_smb_imap.rst | 3 +++
 admin_manual/configuration/user_auth_ldap.rst         | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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