[Pkg-owncloud-commits] [owncloud-doc] 10/12: Merge remote-tracking branch 'upstream/master' 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 0540e58e7782cdef0506c70f4ebbbe806f043e93
Merge: 602c262 e77045f
Author: David Prévot <taffit at debian.org>
Date:   Thu Nov 6 16:47:11 2014 -0400

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

 admin_manual/configuration/auth_ldap.rst           |  6 ++--
 .../configuration_config_sample_php.rst            | 40 ++++++++++++++++++----
 developer_manual/app/js.rst                        |  2 +-
 developer_manual/app/request.rst                   |  2 +-
 4 files changed, 39 insertions(+), 11 deletions(-)

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