[Pkg-owncloud-commits] [owncloud-doc] 02/03: Merge pull request #175 from syncloud/stable5

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit c9cf5ce37741a4f3122d15dcba86c44532a4d2cd
Merge: f1c0e1f 33b72f9
Author: Owen Winkler <a_github at midnightcircus.com>
Date:   Mon Oct 7 12:55:31 2013 -0700

    Merge pull request #175 from syncloud/stable5
    
    Automatic config can set some of parameters or all of them

 .../configuration/configuration_automation.rst     |   48 ++++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)

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