[Pkg-owncloud-commits] [owncloud] 51/104: Merge pull request #6678 from owncloud/backport-6660-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 8d38228c98a8bbd1ff86389bb855550b8ab0ad3b
Merge: 542cf79 bbba8fd
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Jan 8 02:50:15 2014 -0800

    Merge pull request #6678 from owncloud/backport-6660-stable6
    
    Backport 6660 stable6

 lib/private/helper.php         | 6 ++++--
 lib/private/preview/movies.php | 2 +-
 lib/private/preview/office.php | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

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