[Pkg-owncloud-commits] [owncloud-doc] 43/43: 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 85ccda5b89a0eedc92180525eeecbf6327512ad1
Merge: 12dc967 74adec1
Author: David Prévot <taffit at debian.org>
Date:   Tue Aug 20 08:54:01 2013 +0200

    Merge branch 'upstream' into dfsg_clean

 CONTRIBUTING.rst                                   |    6 +-
 README.rst                                         |    2 +-
 .../configuration/configuration_encryption.rst     |    2 +-
 .../configuration/configuring_big_file_upload.rst  |   23 +++
 admin_manual/configuration/custom_mount_config.rst |   21 +--
 .../configuration/custom_mount_config_gui.rst      |   21 ++-
 admin_manual/images/ucs-app-center-install.png     |  Bin 0 -> 75597 bytes
 admin_manual/images/ucs-app-center-module.png      |  Bin 0 -> 106791 bytes
 admin_manual/installation/installation_others.rst  |    5 +
 admin_manual/installation/installation_ucs.rst     |  143 +++++++++--------
 admin_manual/installation/installation_windows.rst |  165 ++++++++++++--------
 admin_manual/maintenance/update.rst                |    3 -
 developer_manual/app/appframework/controllers.rst  |   10 +-
 developer_manual/app/general/security.rst          |   11 +-
 user_manual/files/configuring_big_file_upload.rst  |   11 ++
 user_manual/files/deletedfiles.rst                 |   20 ++-
 user_manual/files/files.rst                        |    5 +-
 user_manual/index.rst                              |    1 +
 18 files changed, 272 insertions(+), 177 deletions(-)

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