[Pkg-javascript-commits] [node-mocks-http] 216/296: Merge branch 'release/1.4.2' 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 60637724873a4d705009ed0b914e0bf0c1c5e0b0
Merge: b62ae3e 41740ab
Author: Johnny Estilles <johnny.estilles at agentia.asia>
Date:   Thu Apr 30 10:57:07 2015 +0800

    Merge branch 'release/1.4.2' into 1.x

 README.md           | 94 ++++++++++++++++++++++++++++++++++++++++++++---------
 lib/mockResponse.js | 23 ++++++-------
 package.json        |  2 +-
 3 files changed, 92 insertions(+), 27 deletions(-)

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