[Pkg-owncloud-commits] [owncloud-doc] 05/06: Merge tag 'upstream/0_20140721'

[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 ef7fa4e5c196e877531eb5a3da39fb5574deeb2d
Merge: 0c060ce 7da487b
Author: David Prévot <taffit at debian.org>
Date:   Tue Jul 22 10:37:53 2014 -0400

    Merge tag 'upstream/0_20140721'
    
    Upstream version 0~20140721

 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