[Pkg-owncloud-commits] [owncloud-doc] 05/09: Merge remote-tracking branch 'upstream/stable5' into upstream-5.0

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 5.0
in repository owncloud-doc.

commit cb389c6ef7b2f3e23eb6a98c9f6be5df14cae902
Merge: 1cc9a98 71347b0
Author: David Prévot <taffit at debian.org>
Date:   Sat Dec 14 15:31:28 2013 -0400

    Merge remote-tracking branch 'upstream/stable5' into upstream-5.0

 CONTRIBUTING.rst                         | 6 +++---
 admin_manual/configuration/auth_ldap.rst | 1 +
 developer_manual/core/ocs-share-api.rst  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

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