[Pkg-owncloud-commits] [owncloud-doc] 03/03: Merge branch 'upstream' into dfsg_clean

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit 32915a6d3916484565596d4d21e4e333a3e2b4c6
Merge: 9f2d0e3 f1c0e1f
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 3 14:46:41 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 user_manual/pim/index.rst           |    1 +
 user_manual/pim/sync_ios.rst        |    4 ++--
 user_manual/pim/sync_osx.rst        |    4 +++-
 user_manual/pim/troubleshooting.rst |   36 +++++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

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