[Pkg-owncloud-commits] [owncloud-doc] 08/10: Merge remote-tracking branch 'upstream/stable7' 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 72f86900926f3285a13071b31f0ae80326eb44b4
Merge: 80a1e72 e225f4f
Author: David Prévot <david at tilapin.org>
Date:   Thu Jul 2 11:41:05 2015 -0400

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

 .../configuration/config_sample_php_parameters.rst |   2 +-
 admin_manual/images/phpinfo.png                    | Bin 19122 -> 0 bytes
 admin_manual/installation/installation_wizard.rst  |  29 ++++++++++-----------
 index/index.rst                                    |  22 ++++++----------
 4 files changed, 23 insertions(+), 30 deletions(-)

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