[Pkg-owncloud-commits] [owncloud-doc] 06/09: Merge branch 'stable7' of https://github.com/owncloud/documentation into 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 d11c465532ef443a96b5cd9aedb7a3d422bf62b5
Merge: bf12e79 81bf5b3
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Dec 8 10:09:47 2014 -0800

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

 admin_manual/configuration/config_sample_php_parameters.rst | 12 ++++++++++++
 admin_manual/configuration/database_configuration.rst       |  2 +-
 go.php                                                      |  2 +-
 user_manual/documents.rst                                   |  3 ++-
 4 files changed, 16 insertions(+), 3 deletions(-)

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