[Pkg-owncloud-commits] [owncloud] 20/38: Merge pull request #14425 from owncloud/backport-12313

[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 eb778eb2b09636c4e34739e64e43ea7a6b590d6d
Merge: 3ac33c8 45ad072
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Feb 23 15:12:57 2015 +0100

    Merge pull request #14425 from owncloud/backport-12313
    
    [stable7] The class name is Movie NOT Movies

 config/config.sample.php                      | 2 +-
 lib/private/preview.php                       | 4 ++--
 lib/private/preview/{movies.php => movie.php} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)

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