[Pkg-owncloud-commits] [owncloud-doc] 05/05: Merge branch 'upstream' into dfsg_clean

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit 4b8c57c2c4c01e1681a42aac88291e03baaa41d4
Merge: 1cc9a98 cf6a1dc
Author: David Prévot <taffit at debian.org>
Date:   Wed Nov 6 20:32:41 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 CONTRIBUTING.rst               |    6 +++---
 admin_manual/conf.py           |    4 ++--
 developer_manual/conf.py       |    4 ++--
 go.php                         |    3 +++
 {user_manual => index}/conf.py |   16 ++++++++--------
 user_manual/conf.py            |    4 ++--
 6 files changed, 20 insertions(+), 17 deletions(-)

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