[Pkg-owncloud-commits] [owncloud-doc] 07/09: Merge remote-tracking branch 'upstream/stable7' into upstream

[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 5db452c2a499e786dac39d66cc73bd4b22349854
Merge: b3839ea d11c465
Author: David Prévot <taffit at debian.org>
Date:   Mon Dec 8 16:06:19 2014 -0400

    Merge remote-tracking branch 'upstream/stable7' into upstream

 .../configuration/database_configuration.rst       |  2 +-
 go.php                                             |  2 +-
 user_manual/documents.rst                          |  3 +-
 user_manual/files/filesweb.rst                     | 40 +++++++++++-----------
 4 files changed, 24 insertions(+), 23 deletions(-)

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