[Pkg-owncloud-commits] [owncloud-doc] 34/71: Merge pull request #1037 from RealRancor/backport_1029_1031_1032_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 ba2030e7da985337b745aa5607b6a7005579981c
Merge: 1dd7da3 e155aa0
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Apr 6 10:39:47 2015 +0200

    Merge pull request #1037 from RealRancor/backport_1029_1031_1032_stable7
    
    Backport #1029, #1031 and #1032 to stable7

 admin_manual/configuration/user_auth_ldap.rst     | 1 +
 admin_manual/installation/nginx_configuration.rst | 4 ++++
 user_manual/webinterface.rst                      | 3 +++
 3 files changed, 8 insertions(+)

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