[Pkg-owncloud-commits] [owncloud-doc] 05/11: Merge pull request #1195 from RealRancor/backport_1185_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 b0abf7bfb6a1da1fca980a167e52efac4fed2c6a
Merge: 834ba3a 744d34a
Author: Carla Schroder <carla at owncloud.com>
Date:   Fri Jun 5 12:19:06 2015 -0700

    Merge pull request #1195 from RealRancor/backport_1185_stable7
    
    Backport #1185 to stable7

 admin_manual/configuration/user_auth_ldap.rst | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

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