[Pkg-owncloud-commits] [owncloud-doc] 35/36: Merge tag 'upstream/0_20140820'

[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 c31c8f2fdb57b30b603441ad8486328dbdd85bbc
Merge: ceff3b4 4f14190
Author: David Prévot <taffit at debian.org>
Date:   Thu Aug 21 10:14:56 2014 -0400

    Merge tag 'upstream/0_20140820'
    
    Upstream version 0~20140820

 .../configuration/configuration_database.rst       |  36 ++++++++++
 .../configuration/configuration_encryption.rst     |  11 ++-
 .../configuration/server_to_server_managing.rst    |  76 ++++++++++++++-------
 admin_manual/images/create_public_share.png        | Bin 0 -> 24377 bytes
 admin_manual/maintenance/backup.rst                |   2 +-
 admin_manual/maintenance/restore.rst               |   2 +-
 admin_manual/maintenance/update.rst                |   2 +
 developer_manual/app/hooks.rst                     |   2 +-
 developer_manual/app/middleware.rst                |   4 +-
 developer_manual/general/devenv.rst                |  22 +++++-
 developer_manual/general/index.rst                 |   1 +
 developer_manual/general/performance.rst           |  64 +++++++++++++++++
 user_manual/files/encryption.rst                   |  14 ++--
 user_manual/files/server_to_server_using.rst       |   2 +-
 user_manual/images/calendar_caldav.png             | Bin 17883 -> 0 bytes
 user_manual/images/calendar_createevent.png        | Bin 17972 -> 13663 bytes
 user_manual/images/calendar_export.png             | Bin 18885 -> 9835 bytes
 user_manual/images/calendar_import.png             | Bin 8250 -> 9074 bytes
 user_manual/images/calendar_manage-calendars.png   | Bin 39313 -> 34730 bytes
 user_manual/images/calendar_newtimezone1.png       | Bin 5253 -> 4868 bytes
 user_manual/images/contact_crop.jpg                | Bin 50676 -> 22353 bytes
 user_manual/images/contact_emptycontact.png        | Bin 21414 -> 11879 bytes
 user_manual/images/contact_import.jpg              | Bin 20281 -> 0 bytes
 user_manual/images/contact_picture.jpg             | Bin 7128 -> 5766 bytes
 user_manual/images/files_versioning.png            | Bin 9333 -> 8557 bytes
 user_manual/images/oc_connect.png                  | Bin 107250 -> 63833 bytes
 user_manual/images/oc_filesweb.png                 | Bin 28666 -> 17316 bytes
 user_manual/images/oc_main_web.png                 | Bin 115762 -> 41092 bytes
 user_manual/images/oc_main_web_labelled.png        | Bin 150798 -> 75961 bytes
 user_manual/images/oc_personal_settings_window.png | Bin 119355 -> 42959 bytes
 user_manual/images/oc_ui.png                       | Bin 138410 -> 45125 bytes
 user_manual/images/oc_user_preferences.png         | Bin 24304 -> 0 bytes
 user_manual/images/owncloud_webinterface_map.png   | Bin 13854 -> 11897 bytes
 user_manual/images/share_link_adding.png           | Bin 32097 -> 18257 bytes
 user_manual/pim/sync_thunderbird.rst               |   3 +-
 user_manual/userpreferences.rst                    |   2 +-
 36 files changed, 203 insertions(+), 40 deletions(-)

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