[Pkg-owncloud-commits] [owncloud-doc] 48/75: Merge pull request #165 from j-ed/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 058a5b0f76385bcf2d2ec569b5638fc87c7cffc1
Merge: e33bf5d d6c7678
Author: Bernhard Posselt <Raydiation at users.noreply.github.com>
Date:   Wed Aug 28 04:43:48 2013 -0700

    Merge pull request #165 from j-ed/stable5
    
    added description of maintenance and default_language parameter

 .../configuration/configuration_language.rst       |   24 ++++++++++++++++++++
 .../configuration/configuration_maintenance.rst    |   21 +++++++++++++++++
 2 files changed, 45 insertions(+)

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