[Pkg-owncloud-commits] [owncloud-doc] 09/09: 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 8fdf26c7e7e3310aeac9a47e5039b5c75fec5ee1
Merge: 97427e9 506ed49
Author: David Prévot <taffit at debian.org>
Date:   Wed Oct 23 17:22:17 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 developer_manual/core/index.rst         |    4 ++-
 developer_manual/core/ocs-share-api.rst |   59 ++++++++++++++++---------------
 go.php                                  |   34 ++++++++++++++++++
 user_manual/files/files.rst             |   32 ++++++++---------
 4 files changed, 83 insertions(+), 46 deletions(-)

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