[Pkg-javascript-commits] [node-convert-source-map] 02/07: Merge tag 'upstream/1.1.2'

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository node-convert-source-map.

commit 3c7a33561473c679573917348f03025e92f7eccc
Merge: 8cbb88d f2486ca
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Fri Nov 20 20:33:40 2015 +0100

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2
    
    # gpg: Signature made Fri 20 Nov 2015 08:33:40 PM CET
    # gpg:                using RSA key 0x733E6BF93CE8F6D9
    # gpg: Good signature from "Ross Gammon (Rosco) <rossgammon at mail.dk>"
    # gpg:                 aka "Ross Gammon (Genealogy) <genealogy at the-gammons.net>"
    # gpg:                 aka "Ross Gammon (www.one-name.org) <gammon at one-name.org>"
    # gpg:                 aka "Ross Gammon (www.the-gammons.net) <ross at the-gammons.net>"
    # gpg:                 aka "[jpeg image of size 3524]"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: FBEE 0190 904F 1EA0 BA6A  300E 53FE 7BBD A689 10FC
    #      Subkey fingerprint: 7AEE BC7A 44AB 8B90 5CA7  8FC6 733E 6BF9 3CE8 F6D9

 index.js                   |  9 ++++++---
 package.json               |  2 +-
 test/convert-source-map.js | 12 ++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

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