[Pkg-javascript-commits] [node-mime] 07/08: Merge tag 'upstream/1.2.10'

[Jérémy Lal]

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

kapouer-guest pushed a commit to branch master
in repository node-mime.

commit fac1f3f75ce1993dd2f29b5eccd0a71a64e97d8e
Merge: 51c2d00 566dd8b
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Aug 14 11:47:06 2013 +0200

    Merge tag 'upstream/1.2.10'
    
    Upstream version 1.2.10
    
    # gpg: Signature faite le mer. 14 août 2013 11:47:04 CEST avec la clef RSA d'identifiant DD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> »

 README.md        |    5 ++++-
 mime.js          |    3 ++-
 package.json     |    2 +-
 test.js          |   29 +++++++++++++++++++++++++++++
 types/mime.types |    2 +-
 types/node.types |   21 +++++++++++++++++++--
 6 files changed, 56 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mime.git