[Pkg-owncloud-commits] [owncloud-doc] 06/08: Merge commit '5d277affa77d1e37d831d6b18e9a7c89111d5f6b' 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 48497302b241698be3fca19ef5efc3fe7614a69a
Merge: 0540e58 5d277af
Author: David Prévot <taffit at debian.org>
Date:   Tue Nov 11 10:06:26 2014 -0400

    Merge commit '5d277affa77d1e37d831d6b18e9a7c89111d5f6b' into upstream

 user_manual/contents.rst  | 12 ++++++------
 user_manual/index.rst     | 33 +++++++++++----------------------
 user_manual/migration.rst | 19 -------------------
 3 files changed, 17 insertions(+), 47 deletions(-)

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