[Pkg-owncloud-commits] [owncloud] 19/50: Merge pull request #10645 from owncloud/backport_7728

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit 69f198d6fbe6309de3af83267110d83c7013ca68
Merge: 7507995 f3d335b
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Sep 3 12:46:12 2014 +0200

    Merge pull request #10645 from owncloud/backport_7728
    
    Backport 7728

 lib/private/image.php   | 51 ++++++++++++++++++++++++++++++++++++++++---------
 lib/private/preview.php |  2 +-
 tests/lib/image.php     | 24 +++++++++++++++++++++--
 3 files changed, 65 insertions(+), 12 deletions(-)

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