[Pkg-owncloud-commits] [owncloud-doc] 38/38: 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 9f2d0e3774e62778982f78b176c69533ac355a85
Merge: 44819fb 79c0b60
Author: David Prévot <taffit at debian.org>
Date:   Fri Sep 27 18:02:28 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 README.rst                                         |    2 +-
 .../configuration/configuration_encryption.rst     |   22 +-
 .../configuration/configuring_big_file_upload.rst  |    5 +-
 admin_manual/installation/installation_windows.rst |    2 +-
 developer_manual/app/app/api/index.rst             |    1 +
 developer_manual/app/app/api/provisioning_api.rst  |  601 ++++++++++++++++++++
 developer_manual/core/theming.rst                  |  172 ++++--
 intro_manual/introduction.rst                      |    1 +
 user_manual/files/configuring_big_file_upload.rst  |    2 +-
 9 files changed, 733 insertions(+), 75 deletions(-)

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