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

[Leo Iannacone]

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

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

commit c1d76b6ba6a8a220415132ddd3e3eb122fd9e69f
Merge: 4df2d2e bb4e14d
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Wed Oct 15 17:49:55 2014 +0200

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

 debian/watch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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