[Pkg-owncloud-commits] [owncloud-doc] 155/227: Merge branch 'webservers' of https://github.com/owncloud/documentation into webservers

[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 dff35772ae8b1e613f19ee67af181be94239d8fa
Merge: df4c89c 13e4a6a
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Sep 22 21:47:14 2014 -0700

    Merge branch 'webservers' of https://github.com/owncloud/documentation into webservers

 admin_manual/installation/configuration_yaws.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