[Pkg-owncloud-commits] [owncloud-doc] 03/05: Merge remote-tracking branch 'upstream/stable6' 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 ce46c5f9b2212e255df22644c7340fe3f680f774
Merge: 2174bba 0263026
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 21 12:14:37 2014 -0400

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

 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