[Pkg-owncloud-commits] [owncloud-doc] 137/227: Merge pull request #571 from owncloud/alracd

[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 aca171614b55dfc30a9ceabdaa1e298c60200874
Merge: c9a34e3 077b078
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Sun Sep 21 11:04:53 2014 +0200

    Merge pull request #571 from owncloud/alracd
    
    Fixed markup for netstat example

 admin_manual/configuration/configuration-antivirus.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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