[Pkg-owncloud-commits] [owncloud-doc] 11/12: Merge tag 'upstream/0_20141106'

[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 5eb1e70b7e5c3544f24f8e5610a6fe8668b20be4
Merge: 6bec1a6 0540e58
Author: David Prévot <taffit at debian.org>
Date:   Thu Nov 6 16:49:46 2014 -0400

    Merge tag 'upstream/0_20141106'
    
    Upstream version 0~20141106

 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