[Pkg-owncloud-commits] [owncloud-doc] 04/06: Merge remote-tracking branch 'upstream/stable6' 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 7da487bb64d342680abc8ed96f44162f69a7534a
Merge: 9787c91 5f647e5
Author: David Prévot <taffit at debian.org>
Date:   Tue Jul 22 10:37:02 2014 -0400

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

 admin_manual/conf.py     | 4 ++--
 developer_manual/conf.py | 4 ++--
 user_manual/conf.py      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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