[Pkg-owncloud-commits] [owncloud-doc] 07/09: 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 e002742c2f267abe5461be14fd2a399b573ed39e
Merge: 009fcde d83ad1c
Author: David Prévot <david at tilapin.org>
Date:   Sat Sep 12 11:32:51 2015 -0400

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

 README.rst                                         |  80 +++++-----
 .../external_storage_configuration_gui.rst         |  15 --
 index/Makefile                                     | 173 ---------------------
 index/conf.py                                      | 169 --------------------
 index/howto_contribute.rst                         |  63 --------
 index/index.rst                                    | 168 --------------------
 user_manual/pim/contacts.rst                       |   2 +-
 7 files changed, 38 insertions(+), 632 deletions(-)

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