[Pkg-javascript-commits] [node-acorn-jsx] 404/484: Merge branch 'upstream' into jsx2

[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-acorn-jsx.

commit d1f28b75aa5a7451baadf98f14f0b42ef8b1fd6b
Merge: 29910d2 94b5efc
Author: Ingvar Stepanyan <me at rreverser.com>
Date:   Wed Jan 21 03:01:27 2015 +0000

    Merge branch 'upstream' into jsx2

 acorn.js              | 39 ++++++++++++++++++++++-----------------
 acorn_loose.js        |  2 +-
 test/tests-harmony.js | 41 +++++++++++++++++++++++++++++++++++++++++
 util/walk.js          | 10 +++++++++-
 4 files changed, 73 insertions(+), 19 deletions(-)


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