[Pkg-javascript-commits] [node-serve-static] 01/01: Merge branch 'upstream' of ssh://git.debian.org/git/pkg-javascript/node-serve-static into upstream

[Leo Iannacone]

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

l3on-guest pushed a commit to branch upstream
in repository node-serve-static.

commit d0a9afbe28c9a3a744721c8d8ed1faf30eb512be
Merge: 5d7c37a ca2ea4e
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Wed Oct 15 17:59:03 2014 +0200

    Merge branch 'upstream' of ssh://git.debian.org/git/pkg-javascript/node-serve-static into upstream
    
    Conflicts:
    	HISTORY.md
    	README.md
    	index.js
    	package.json
    	test/test.js


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