[Pkg-owncloud-commits] [owncloud-doc] 31/71: Merge pull request #1027 from RealRancor/backport_929_1014_stable7

[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 1dd7da3dd34e4960d38c5b07e71ee027db16854d
Merge: a8f90c7 b4d6e83
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Sun Apr 5 00:09:31 2015 +0200

    Merge pull request #1027 from RealRancor/backport_929_1014_stable7
    
    Backport #929 and #1014 to stable7

 admin_manual/issues/index.rst       | 102 ++++++++++++++++++++++++++++++++----
 user_manual/pim/troubleshooting.rst |  76 +--------------------------
 2 files changed, 93 insertions(+), 85 deletions(-)

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