[Pkg-owncloud-commits] [owncloud] 09/20: Merge pull request #8384 from owncloud/kill_office_fallback_stable6

[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 86757cdb45a66128ee2e37080014a17ca1c808d3
Merge: 65ea07f a3d93f0
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Apr 28 20:29:06 2014 +0200

    Merge pull request #8384 from owncloud/kill_office_fallback_stable6
    
    backport b68098ebbaaa3bd816d24c1ed304425e838ee6b8 to stable6

 lib/private/preview/office-fallback.php | 143 --------------------------------
 lib/private/preview/office.php          |   6 --
 2 files changed, 149 deletions(-)

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