[Pkg-owncloud-commits] [owncloud-doc] 10/11: Merge tag 'upstream/0_20150618'

[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 31578a7789bd4d3289bb2e339789ae984ba814a1
Merge: b7284ac 80a1e72
Author: David Prévot <david at tilapin.org>
Date:   Tue Jun 23 18:30:46 2015 -0400

    Merge tag 'upstream/0_20150618'
    
    Upstream version 0~20150618

 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