[Pkg-owncloud-commits] [owncloud-doc] 37/49: Merge remote-tracking branch 'upstream/stable7' into upstream

[David Prévot]

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

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

commit df2d1ca6143bf8d045372339479eb3abe1723acc
Merge: 4881b86 04c01b7
Author: David Prévot <david at tilapin.org>
Date:   Sat Feb 21 10:56:19 2015 -0400

    Merge remote-tracking branch 'upstream/stable7' into upstream

 .../big_file_upload_configuration.rst              |  26 +-
 .../collaborative_documents_configuration.rst      |  26 +-
 .../configuration/config_sample_php_parameters.rst |  46 ++--
 .../external_storage_configuration.rst             |   4 +
 admin_manual/configuration/index.rst               |   3 +-
 admin_manual/configuration/occ_command.rst         |  17 +-
 admin_manual/configuration/performance_tips.rst    | 270 +++++++++++++++++++++
 .../configuration/user_auth_ftp_smb_imap.rst       |   4 +-
 admin_manual/images/documents_apply_test.png       | Bin 0 -> 20493 bytes
 admin_manual/installation/linux_installation.rst   |   2 +
 .../installation/selinux_configuration.rst         |   6 +
 admin_manual/installation/source_installation.rst  |  23 +-
 admin_manual/issues/index.rst                      |  17 +-
 admin_manual/maintenance/backup.rst                |   2 +-
 developer_manual/app/l10n.rst                      |   2 +-
 user_manual/files/files.rst                        |  16 +-
 user_manual/index.rst                              |   3 +-
 user_manual/pim/calendar.rst                       |  13 +
 user_manual/pim/contacts.rst                       |   9 +
 19 files changed, 449 insertions(+), 40 deletions(-)

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