[libmime-types-perl] 01/04: Merge tag 'upstream/2.04'

[Damyan Ivanov]

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libmime-types-perl.

commit 4f9acc6bd7084a3b44d1ae8ab62380042e5a5559
Merge: 7cd9532 64e5d30
Author: Damyan Ivanov <dmn at debian.org>
Date:   Tue Oct 22 19:18:52 2013 +0000

    Merge tag 'upstream/2.04'
    
    Upstream version 2.04

 ChangeLog          |   57 +-
 MANIFEST           |    3 +
 META.json          |    6 +-
 META.yml           |    6 +-
 Makefile.PL        |   10 +-
 bin/collect-types  |  341 +++++
 bin/update-iana    |    9 +
 lib/MIME/Type.pm   |   29 +-
 lib/MIME/Type.pod  |   30 +-
 lib/MIME/Types.pm  | 1221 ++----------------
 lib/MIME/Types.pod |  112 +-
 lib/MIME/types.db  | 3612 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 t/20types.t        |   37 +-
 t/30export.t       |    4 +-
 14 files changed, 4270 insertions(+), 1207 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmime-types-perl.git