[Pkg-javascript-commits] [node-diacritics] 03/06: Merge tag 'upstream/1.2.1'

[Andrew Kelley]

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

andrewrk-guest pushed a commit to branch master
in repository node-diacritics.

commit e7d8038b082dd61535179f996044b143eb673189
Merge: 4ba60db 59d02ee
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sat May 16 17:11:01 2015 +0000

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature made Sat 16 May 2015 05:10:56 PM UTC using RSA key ID 6D58AAC8
    # gpg: Good signature from "Andrew Kelley <superjoe30 at gmail.com>"

 .gitignore     |  2 --
 LICENSE        | 23 +++++++++++++++++++++++
 Makefile       | 11 -----------
 README.md      | 21 +++++++--------------
 component.json | 20 --------------------
 package.json   | 12 +++++++++---
 6 files changed, 39 insertions(+), 50 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-diacritics.git