[Pkg-owncloud-commits] [owncloud-doc] 75/75: 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 2eb29322c76b24b9cb3d72d7cd95ed1bd7022a5b
Merge: 85ccda5 016051b
Author: David Prévot <taffit at debian.org>
Date:   Wed Sep 4 13:43:34 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 .../configuration/configuration_custom_clients.rst |   27 ++++
 .../configuration/configuration_encryption.rst     |    4 +-
 .../configuration/configuration_language.rst       |   24 +++
 .../configuration/configuration_logging.rst        |   10 ++
 .../configuration/configuration_maintenance.rst    |   21 +++
 admin_manual/installation/installation_others.rst  |    4 +-
 intro_manual/images/Figure0.png                    |  Bin 0 -> 31319 bytes
 intro_manual/images/Figure1.png                    |  Bin 0 -> 19436 bytes
 intro_manual/images/Figure2.png                    |  Bin 0 -> 79110 bytes
 intro_manual/images/Figure3.png                    |  Bin 0 -> 141892 bytes
 intro_manual/images/Figure4.png                    |  Bin 0 -> 151299 bytes
 intro_manual/images/Figure5.png                    |  Bin 0 -> 66114 bytes
 intro_manual/images/Figure6.png                    |  Bin 0 -> 94002 bytes
 intro_manual/images/Figure7.png                    |  Bin 0 -> 55594 bytes
 intro_manual/introduction.rst                      |  170 ++++++++++++++++++++
 15 files changed, 256 insertions(+), 4 deletions(-)

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