[Pkg-owncloud-commits] [owncloud-doc] 133/270: Merge pull request #361 from owncloud/user-man-updates

[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 5f92180f908bc76a740a9c5ab38987c45f0cb5c2
Merge: 908566b 5281804
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Sat May 31 08:15:43 2014 +0200

    Merge pull request #361 from owncloud/user-man-updates
    
    User man updates

 user_manual/bookmarks.rst        | 2 +-
 user_manual/files/encryption.rst | 2 +-
 user_manual/files/files.rst      | 9 +++++----
 user_manual/files/filesweb.rst   | 4 ++--
 user_manual/pim/contacts.rst     | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

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