[Pkg-javascript-commits] [node-mime] 04/13: Merge tag 'upstream/1.2.11'

[Jérémy Lal]

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

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

commit 5b75a48610d7944ba9ef1c12fb61ef3a6aedeb8a
Merge: 482779b 5626df1
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Jun 14 15:22:52 2014 +0200

    Merge tag 'upstream/1.2.11'
    
    Upstream version 1.2.11
    
    # gpg: Signature faite le sam. 14 juin 2014 15:22:49 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> »

 mime.js      |  2 +-
 package.json |  2 +-
 test.js      | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

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