[Pkg-owncloud-commits] [owncloud-doc] 06/09: Merge remote-tracking branch 'upstream/stable6' 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 9787c9106dfbd5c6afa9822a73d69c62bf7e8699
Merge: c273d08 149986f
Author: David Prévot <taffit at debian.org>
Date:   Wed Jul 9 10:22:03 2014 -0400

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

 admin_manual/installation/installation_windows.rst | 39 ++++++++++++----------
 1 file changed, 22 insertions(+), 17 deletions(-)

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