[Pkg-owncloud-commits] [owncloud-doc] 05/07: Merge remote-tracking branch 'upstream/stable7' 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 d532a56cfd254ff8347055074bd7dec20d58022b
Merge: f979be3 2125a07
Author: David Prévot <david at tilapin.org>
Date:   Sat Aug 29 18:24:28 2015 -0400

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

 .../configuration/logging_configuration.rst        | 48 +++++++++-------------
 user_manual/pim/contacts.rst                       |  4 +-
 user_manual/pim/sync_ios.rst                       |  8 ++--
 user_manual/pim/sync_osx.rst                       |  5 ++-
 4 files changed, 31 insertions(+), 34 deletions(-)

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