[Pkg-owncloud-commits] [owncloud] 42/104: Merge pull request #6664 from owncloud/fix_empty_mimetypes_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 6a838718dfc34d6c8ea0fa1dc8cd37132ba7cf0b
Merge: 956a441 c81a05c
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Jan 7 07:31:29 2014 -0800

    Merge pull request #6664 from owncloud/fix_empty_mimetypes_stable6
    
    remove duplicate exe mimetype, add correct msi mimetype

 lib/private/mimetypes.list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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