[Pkg-javascript-commits] [node-acorn-jsx] 433/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 2f40d7e30e153541aaac39711ecf27cdad0ab21c
Merge: 401e6c4 6eb1775
Author: Ingvar Stepanyan <me at rreverser.com>
Date:   Tue Jan 27 16:27:59 2015 +0200

    Merge branch 'upstream' into jsx2

 acorn.js              |  59 ++++++-----
 acorn_loose.js        |  34 +++++--
 test/tests-harmony.js | 266 +++++++++++++++++++++++++++++++++-----------------
 3 files changed, 238 insertions(+), 121 deletions(-)


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