[DRE-commits] [ruby-mime-types] 01/05: Merge tag 'upstream/1.25'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-mime-types.

commit 687ff0edbc6a609e133aaac2e449cd58fe4679dc
Merge: baa7029 cff082f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Sep 14 16:09:21 2013 +0200

    Merge tag 'upstream/1.25'
    
    Upstream version 1.25
    
    # gpg: Signature faite le sam. 14 sept. 2013 16:09:21 CEST avec la clef RSA d'identifiant 8F9F8F09
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .travis.yml                            |    9 +-
 Contributing.rdoc                      |   23 +--
 Gemfile                                |    7 +-
 History.rdoc                           |   49 ++++++
 Manifest.txt                           |    2 +
 README.rdoc                            |   84 ++++++---
 Rakefile                               |   41 ++++-
 checksums.yaml.gz                      |  Bin 0 -> 425 bytes
 checksums.yaml.gz.sig                  |  Bin 0 -> 256 bytes
 data.tar.gz.sig                        |  Bin 256 -> 256 bytes
 lib/mime/types.rb                      |  303 ++++++++++++++++++++------------
 lib/mime/types/application             |   12 +-
 lib/mime/types/application.nonstandard |    1 +
 lib/mime/types/image                   |    2 +-
 lib/mime/types/text.obsolete           |    2 +-
 lib/mime/types/video                   |    2 +
 lib/mime/types/video.nonstandard       |    2 +-
 metadata.gz.sig                        |  Bin 256 -> 256 bytes
 metadata.yml                           |  197 ++++++++++-----------
 test/test_mime_type.rb                 |    5 +-
 test/test_mime_types.rb                |    9 +-
 test/test_mime_types_cache.rb          |   77 ++++++++
 test/test_mime_types_lazy.rb           |   40 +++++
 23 files changed, 601 insertions(+), 266 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mime-types.git