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

[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 11f494eea59bf5dccbe9bea9b0dc81471fca9471
Merge: 4dc6ca1 386963d
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Thu Nov 12 08:32:47 2015 +0100

    Merge tag 'upstream/2.12'
    
    Upstream version 2.12

 ChangeLog                |  6 ++++
 MANIFEST                 |  1 +
 META.json                |  2 +-
 META.yml                 |  2 +-
 Makefile.PL              |  4 +--
 lib/MIME/Type.pm         |  2 +-
 lib/MIME/Type.pod        |  4 +--
 lib/MIME/Types.pm        |  2 +-
 lib/MIME/Types.pod       |  4 +--
 lib/MIME/types.db        | 78 ++++++++++++++++++++++++++++++++++--------------
 lib/MojoX/MIME/Types.pm  |  2 +-
 lib/MojoX/MIME/Types.pod |  4 +--
 xt/98perl.t              |  8 +++++
 xt/99pod.t               |  2 +-
 14 files changed, 85 insertions(+), 36 deletions(-)

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