[Pkg-javascript-commits] [node-coffeeify] 02/08: Merge tag 'upstream/1.2.0'

[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-coffeeify.

commit ca917302a97512aedced5a4a508f6b0e287cec3c
Merge: ff532b4 6ec2111
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Wed Nov 25 21:03:45 2015 +0100

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0
    
    # gpg: Signature made Wed 25 Nov 2015 09:03:33 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

 .travis.yml       |  3 ++-
 package.json      | 12 ++++++------
 test/transform.js |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

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