[Pkg-owncloud-commits] [owncloud-doc] 04/05: Merge tag 'upstream/0_20140428'

[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 aad430aa050fc722003a12fe415889dfa7e54561
Merge: bc2e7e4 0bb5f3d
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 28 22:48:02 2014 -0400

    Merge tag 'upstream/0_20140428'
    
    Upstream version 0~20140428

 admin_manual/config/default_parameters.rst         |  10 +--
 admin_manual/config/mail_parameters.rst            |   4 +-
 admin_manual/config/miscellaneous.rst              |  96 ++++++++++-----------
 admin_manual/configuration/xsendfile.rst           |   4 +-
 admin_manual/contents.rst                          |   3 +
 admin_manual/cron/index.rst                        |   2 +-
 admin_manual/index.rst                             |   2 +
 .../images/ucs-app-center-install.png              | Bin
 .../images/ucs-app-center-module.png               | Bin
 admin_manual/{ => installation}/images/ucsint.png  | Bin
 admin_manual/{ => installation}/images/ucsint1.png | Bin
 admin_manual/{ => installation}/images/ucsint2.png | Bin
 admin_manual/installation/installation_ucs.rst     |  26 +++---
 13 files changed, 76 insertions(+), 71 deletions(-)

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