[Pkg-owncloud-commits] [owncloud-doc] 04/27: Merge pull request #1319 from RealRancor/backport_1313_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 4783c7a3117d986eff40e6f6344151dea62911ac
Merge: 0291582 5682ecb
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Jul 14 14:11:20 2015 -0700

    Merge pull request #1319 from RealRancor/backport_1313_stable7
    
    Backport #1313 to stable7

 admin_manual/configuration/user_auth_ftp_smb_imap.rst | 3 +++
 admin_manual/installation/source_installation.rst     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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