[Pkg-owncloud-commits] [owncloud-doc] 02/05: Merge pull request #326 from JohnVeness/stable6

[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 026302605c6bb097f0e14c4a01df0ca4529b6bb6
Merge: 65c4b7b f8b9618
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Apr 21 14:59:16 2014 +0200

    Merge pull request #326 from JohnVeness/stable6
    
    Edit auth_ldap.rst

 admin_manual/configuration/auth_ldap.rst | 65 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 33 deletions(-)

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