[Pkg-owncloud-commits] [owncloud-doc] 09/11: Merge remote-tracking branch 'upstream/master' 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 f091922fd1ae9c1f63a82204a9e0551a37b43da3
Merge: 4f14190 a3fbc65
Author: David Prévot <taffit at debian.org>
Date:   Mon Aug 25 18:30:07 2014 -0400

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

 developer_manual/app/routes.rst              |  2 +-
 developer_manual/general/devenv.rst          |  9 +++------
 user_manual/files/deletedfiles.rst           |  2 +-
 user_manual/files/filesweb.rst               | 16 ++++++++--------
 user_manual/files/quota.rst                  |  6 +++---
 user_manual/files/server_to_server_using.rst |  2 +-
 user_manual/webinterface.rst                 | 20 +++++++++++---------
 7 files changed, 28 insertions(+), 29 deletions(-)

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