[Pkg-owncloud-commits] [owncloud] 52/55: Merge pull request #8323 from owncloud/stable5-backport-8183-and-co

[David Prévot]

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

taffit pushed a commit to annotated tag v5.0.16RC1
in repository owncloud.

commit b4c207ae30f74f08ddf0f5c218bfd0a7b9f5f4ae
Merge: 29b7927 23e3752
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Wed Apr 23 14:37:00 2014 +0200

    Merge pull request #8323 from owncloud/stable5-backport-8183-and-co
    
    Backport of #8183 and #8197

 lib/base.php                 |  29 ++++++
 lib/connector/sabre/file.php |   7 +-
 lib/helper.php               |  25 ++++-
 lib/json.php                 |   2 -
 lib/mimetypes.list.php       | 223 +++++++++++++++++++++++++------------------
 lib/template.php             |  22 -----
 6 files changed, 185 insertions(+), 123 deletions(-)

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