[Pkg-owncloud-commits] [owncloud-doc] 06/07: Merge tag 'upstream/0_20150817'

[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 fe5d46360d764029b9353e757e6d25c5191edf03
Merge: ac695f5 d532a56
Author: David Prévot <david at tilapin.org>
Date:   Sat Aug 29 18:25:38 2015 -0400

    Merge tag 'upstream/0_20150817'
    
    Upstream version 0~20150817

 .../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