[Pkg-owncloud-commits] [owncloud-doc] 46/110: 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 39ed5e78ada53dd41aba84c926f490ec1832d6f7
Merge: 2f63cce aef3609
Author: Carla Schroder <carla at owncloud.com>
Date:   Wed Dec 31 12:03:42 2014 -0800

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

 user_manual/files/files.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