[libmime-types-perl] 01/02: Merge tag 'upstream/2.06'

[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 e2f92f21e01f3cb001a69e23eeedf36bb5f9314b
Merge: dfa66c5 d34db4e
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Thu Aug 28 17:49:06 2014 +0200

    Merge tag 'upstream/2.06'
    
    Upstream version 2.06

 ChangeLog          |  11 ++-
 META.json          |   2 +-
 META.yml           |   2 +-
 Makefile.PL        |   2 +-
 bin/collect-types  |  15 ++--
 lib/MIME/Type.pm   |   2 +-
 lib/MIME/Type.pod  |   4 +-
 lib/MIME/Types.pm  |   2 +-
 lib/MIME/Types.pod |   4 +-
 lib/MIME/types.db  | 203 ++++++++++++++++++++++++-----------------------------
 10 files changed, 115 insertions(+), 132 deletions(-)

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