[Pkg-owncloud-commits] [owncloud-doc] 13/13: 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 7918cc9aef0d39fec4f445ded0c5a99fd4afa8ca
Merge: e23f2ed 472dc20
Author: David Prévot <taffit at debian.org>
Date:   Wed Nov 27 12:51:59 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 admin_manual/configuration/auth_ldap.rst           |  14 +--
 admin_manual/configuration/background_jobs.rst     |   5 +-
 .../configuration/configuration_preview.rst        | 124 +++++++++++++++++++++
 .../configuration/custom_mount_config_gui.rst      |  13 +--
 .../custom_mount_config_gui_google_drive.rst       |  73 ------------
 admin_manual/configuration/index.rst               |   1 +
 .../custom_mount_config_gui_add_google_drive-1.png | Bin 26480 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-2.png | Bin 15526 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-3.png | Bin 8244 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-4.png | Bin 9818 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-5.png | Bin 2820 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-6.png | Bin 12736 -> 0 bytes
 admin_manual/maintenance/backup.rst                |  16 +--
 admin_manual/maintenance/restore.rst               |  16 +--
 user_manual/contents.rst                           |   1 -
 user_manual/external_storage/google_drive.rst      |  49 ++++----
 16 files changed, 181 insertions(+), 131 deletions(-)

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