[Pkg-owncloud-commits] [owncloud-doc] 04/04: Merge branch 'upstream' into dfsg_clean

[David Prévot]

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

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

commit 97427e9555fcee0d80208fafb52cf750452d59a7
Merge: 266c679 ba76d1c
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 17 18:18:53 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 admin_manual/installation/installation_others.rst |    4 +-
 developer_manual/core/ocs-share-api.rst           |  119 +++++++++++++++++++++
 2 files changed, 121 insertions(+), 2 deletions(-)

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