[Pkg-javascript-commits] [node-mocks-http] 125/296: Merge branch 'hotfix/1.2.6' into 1.x

[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 47a907b20482b1977f045a845f2a801a87d79a84
Merge: f8f1cef 01bea4a
Author: Johnny Estilles <johnny.estilles at agentia.asia>
Date:   Thu Mar 19 19:39:01 2015 +0800

    Merge branch 'hotfix/1.2.6' into 1.x

 lib/mockRequest.js       | 43 +++++++++++++++++++++++++++++++------------
 package.json             |  2 +-
 test/test-mockRequest.js | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 13 deletions(-)

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