[Pkg-owncloud-commits] [owncloud-doc] 06/08: Merge remote-tracking branch 'upstream/master' 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 1127e33c8c903896aef3c9798efa9a9e3c84c65c
Merge: 5c16c02 a8fc638
Author: David Prévot <taffit at debian.org>
Date:   Mon Aug 4 11:59:57 2014 -0400

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

 admin_manual/installation/installation_wizard.rst | 2 +-
 admin_manual/maintenance/update.rst               | 6 +++---
 developer_manual/app/middleware.rst               | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

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