[Pkg-owncloud-commits] [owncloud-doc] 09/11: 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 80a1e72ee65c62b2731e46895d803547f7679542
Merge: 51c0080 1a7897f
Author: David Prévot <david at tilapin.org>
Date:   Tue Jun 23 18:26:47 2015 -0400

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

 admin_manual/configuration/user_auth_ldap.rst |  25 ++--
 admin_manual/contents.rst                     |   1 +
 admin_manual/images/phpinfo.png               | Bin 0 -> 19122 bytes
 admin_manual/release_notes.rst                | 188 ++++++++++++++++++++++++++
 developer_manual/app/info.rst                 |   2 +-
 developer_manual/core/theming.rst             |  26 +++-
 6 files changed, 226 insertions(+), 16 deletions(-)

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