[Pkg-owncloud-commits] [owncloud-doc] 12/12: 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 44819fb9e963199d6b5dd8da5f83b0da103dabdf
Merge: 2eb2932 0f0783e
Author: David Prévot <taffit at debian.org>
Date:   Fri Sep 6 17:55:01 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 .../configuration/configuring_big_file_upload.rst  |   52 +++++++++++++-------
 admin_manual/configuration/index.rst               |   11 +++--
 admin_manual/index.rst                             |   10 +++-
 developer_manual/app/app/css.rst                   |    2 +
 developer_manual/app/app/static.rst                |    5 ++
 developer_manual/app/appframework/externalapi.rst  |    1 -
 developer_manual/app/appframework/index.rst        |    1 -
 developer_manual/app/appframework/tutorial.rst     |   20 ++++----
 developer_manual/app/index.rst                     |    1 -
 developer_manual/app/intro/createapp.rst           |    8 +--
 10 files changed, 72 insertions(+), 39 deletions(-)

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