[libmime-types-perl] 01/05: Merge tag 'upstream/2.05'

[Salvatore Bonaccorso]

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

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

commit 120df2c2049d5d9b86cebc9eb9cf46635608227b
Merge: d9bae03 2888be8
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Aug 27 17:21:40 2014 +0200

    Merge tag 'upstream/2.05'
    
    Upstream version 2.05

 ChangeLog          |   9 +
 META.json          |   2 +-
 META.yml           |   2 +-
 Makefile.PL        |   2 +-
 bin/collect-types  |  81 ++++-
 lib/MIME/Type.pm   |   7 +-
 lib/MIME/Type.pod  |  24 +-
 lib/MIME/Types.pm  |   4 +-
 lib/MIME/Types.pod |   9 +-
 lib/MIME/types.db  | 957 +++++++++++++++++++++++++++++++++++++++++++++--------
 t/20types.t        |  12 +-
 11 files changed, 948 insertions(+), 161 deletions(-)

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