[Pkg-javascript-commits] [node-mocks-http] 66/296: Merge remote-tracking branch 'upstream/master'

[Thorsten Alteholz]

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

alteholz pushed a commit to branch master
in repository node-mocks-http.

commit 9ab491b4cb4c578871cbad3ed2659005aafc9550
Merge: fcf9ccd 5ea3e0d
Author: Alex Brown <alex at alexjamesbrown.com>
Date:   Wed Jan 7 01:09:08 2015 +0000

    Merge remote-tracking branch 'upstream/master'

 examples/express-status-vs-json.js | 51 ++++++++++++++++++++++++++++++++++++++
 lib/mockRequest.js                 | 16 ++++++------
 lib/mockResponse.js                |  5 +++-
 package.json                       |  2 +-
 test/test-mockResponse.js          | 12 +++++++++
 5 files changed, 77 insertions(+), 9 deletions(-)


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