[Pkg-javascript-commits] [node-module-deps] 401/444: Merge branch 'master' into streams3

[Bastien Roucariès]

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

rouca pushed a commit to branch master
in repository node-module-deps.

commit 2014f51f3a67493979683b0b69e0f5509968715c
Merge: 6769486 9112e32
Author: James Halliday <mail at substack.net>
Date:   Fri Oct 16 13:32:07 2015 -0700

    Merge branch 'master' into streams3

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


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