[Pkg-owncloud-commits] [owncloud-doc] 03/05: 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 b15da3d842549a5b56fb101c8e9a0428b5084244
Merge: 6499022 18f8c0f
Author: David Prévot <david at tilapin.org>
Date:   Fri Oct 30 15:11:02 2015 -0400

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

 admin_manual/maintenance/upgrade.rst | 47 +++++++++++++++---------------------
 admin_manual/release_notes.rst       |  5 ++++
 2 files changed, 24 insertions(+), 28 deletions(-)

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