[Pkg-owncloud-commits] [owncloud] 50/74: Merge pull request #12373 from owncloud/backport_preview_fixes_stable7

[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.

commit 8ea0187ecdf37bc26aa1c0260e34f2dd9c744e99
Merge: abc7f14 d7779f9
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Nov 24 13:28:00 2014 +0100

    Merge pull request #12373 from owncloud/backport_preview_fixes_stable7
    
    Backport preview fixes stable7

 lib/private/preview.php | 125 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 105 insertions(+), 20 deletions(-)

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