[Pkg-owncloud-commits] [owncloud-doc] 12/14: Merge remote-tracking branch 'upstream/stable6' 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 2e2a0e2ee71e248725b709590ae5deb502da6bdf
Merge: 00177f2 abeb0ed
Author: David Prévot <taffit at debian.org>
Date:   Wed Jun 11 12:03:25 2014 -0400

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

 README.rst                                         |  14 +++
 admin_manual/configuration/configuration_apps.rst  |   3 +-
 .../configuration/configuration_database.rst       | 104 ++++++++++++------
 admin_manual/configuration/configuration_users.rst |   3 +-
 .../configuration/configuring_big_file_upload.rst  |   3 +-
 .../images/install-wizard-advanced.png             | Bin 0 -> 107639 bytes
 .../installation/images/install-wizard.png         | Bin 0 -> 86115 bytes
 admin_manual/installation/index.rst                |   3 +-
 admin_manual/installation/installation_linux.rst   |   5 +-
 admin_manual/installation/installation_source.rst  | 110 ++++---------------
 admin_manual/installation/installation_windows.rst |  21 ++--
 admin_manual/installation/installation_wizard.rst  | 119 +++++++++++++++++++++
 admin_manual/issues/index.rst                      |   2 +-
 developer_manual/bugtracker/index.rst              |   9 +-
 user_manual/bookmarks.rst                          |   6 +-
 user_manual/files/filesweb.rst                     |  12 ++-
 user_manual/pim/contacts.rst                       |   7 ++
 user_manual/pim/sync_thunderbird.rst               |   7 +-
 18 files changed, 273 insertions(+), 155 deletions(-)

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