[Pkg-owncloud-commits] [owncloud-doc] 10/71: Merge pull request #650 from florianjacob/master

[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 8b131b51cc32fbec19083fa76279b7f6a7fbc30a
Merge: b2537aa 0668988
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Sun Nov 16 20:48:28 2014 +0100

    Merge pull request #650 from florianjacob/master
    
    ownCloud runs on Microsoft Windows, not Word ;)

 admin_manual/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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