[Pkg-owncloud-commits] [owncloud-doc] 31/33: Merge remote-tracking branch 'upstream/stable7' 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 b3839ea9f3ba8300b4d156584946c07d5683d403
Merge: e13bc57 723e520
Author: David Prévot <taffit at debian.org>
Date:   Sat Dec 6 01:40:06 2014 -0400

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

 README.rst                                         |   5 +-
 .../configuration/config_sample_php_parameters.rst |  39 ++++--
 admin_manual/configuration/index.rst               |   2 +-
 admin_manual/contents.rst                          |   2 +-
 admin_manual/index.rst                             |   1 +
 admin_manual/installation/index.rst                |   5 +-
 admin_manual/installation/linux_installation.rst   |  17 ++-
 .../installation/selinux_configuration.rst         |  36 ++++++
 admin_manual/issues/index.rst                      |  34 +++--
 admin_manual/maintenance/index.rst                 |   2 +-
 developer_manual/bugtracker/codereviews.rst        |   9 +-
 developer_manual/bugtracker/index.rst              |  19 ++-
 developer_manual/bugtracker/triaging.rst           | 140 +++++++++++++++++++++
 developer_manual/images/triageworkflow.png         | Bin 0 -> 81127 bytes
 user_manual/files/filesweb.rst                     |  13 +-
 15 files changed, 282 insertions(+), 42 deletions(-)

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