[Pkg-javascript-commits] [node-connect-static] 02/03: 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-connect-static.

commit aca482ba46632e2b6cf21c01a132bc4b82b3d327
Merge: 602cada 686cccf
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Tue Jul 1 15:53:53 2014 +0000

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature made Tue 01 Jul 2014 03:53:50 PM UTC using RSA key ID 6D58AAC8
    # gpg: Good signature from "Andrew Kelley <superjoe30 at gmail.com>"

 index.js     | 4 ++++
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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