[Pkg-javascript-commits] [node-mocha] 02/03: Merge tag 'upstream/1.20.0'

[Leo Iannacone]

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

l3on-guest pushed a commit to branch master
in repository node-mocha.

commit 35d51d5f0067b31e7653458c6829b3615481aabb
Merge: ad5a6f0 d8ac9b4
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Sat May 31 13:39:15 2014 +0200

    Merge tag 'upstream/1.20.0'
    
    Upstream version 1.20.0
    
    # gpg: Signature made sab 31 mag 2014 13:39:12 CEST using RSA key ID D282FC25
    # gpg: Good signature from "Leo Iannacone <l3on at ubuntu.com>"
    # gpg:                 aka "Leo Iannacone <leo.iannacone at gmail.com>"
    # gpg:                 aka "Leo Iannacone <l3on at ubuntu-it.org>"
    # gpg:                 aka "Leonardo Iannacone <leonardo.iannacone at studio.unibo.it>"
    # gpg:                 aka "Leo Iannacone <info at leoiannacone.com>"
    # gpg:                 aka "Leonardo Iannacone <liannacone at arces.unibo.it>"

 History.md                 | 17 +++++++++++++++++
 bin/_mocha                 |  7 +++++++
 bower.json                 |  2 +-
 component.json             |  2 +-
 lib/interfaces/bdd.js      |  2 ++
 lib/interfaces/exports.js  |  6 ++++--
 lib/interfaces/qunit.js    |  2 ++
 lib/interfaces/tdd.js      |  2 ++
 lib/reporters/json.js      | 17 +++++++++--------
 lib/runner.js              |  1 -
 lib/suite.js               |  6 ++++--
 lib/utils.js               |  2 +-
 mocha.js                   |  6 ++++--
 package.json               | 14 +++++++++++---
 support/tail.js            |  4 ++--
 test/acceptance/context.js | 43 ++++++++++++++++++++++++++++++++++++++++++-
 16 files changed, 109 insertions(+), 24 deletions(-)

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