[Pkg-owncloud-commits] [owncloud-doc] 04/06: Merge remote-tracking branch 'upstream/stable7' into upstream

[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 009fcde65acf618a4a621ccd202a3a375d576209
Merge: d532a56 56768ef
Author: David Prévot <david at tilapin.org>
Date:   Wed Sep 2 06:52:00 2015 -0400

    Merge remote-tracking branch 'upstream/stable7' into upstream

 admin_manual/configuration/user_auth_ldap.rst |  5 +++--
 index/index.rst                               | 15 ++-------------
 2 files changed, 5 insertions(+), 15 deletions(-)

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