[DRE-commits] [ruby-execjs] 03/04: Merge tag 'upstream/2.5.2'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-execjs.

commit e56a2b0f122f5373ba52e5fea95c30d202ca65ae
Merge: cccc916 170f134
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 14 14:47:15 2015 -0300

    Merge tag 'upstream/2.5.2'
    
    Upstream version 2.5.2
    
    # gpg: Signature made Sex 14 Ago 2015 14:47:13 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .gitignore                     |  1 +
 .travis.yml                    | 47 +++++++++++++++++++++++++----
 CONTRIBUTING.md                |  2 +-
 Gemfile                        |  1 +
 LICENSE                        |  4 +--
 MAINTAINING.md                 |  6 ++--
 README.md                      |  3 +-
 Rakefile                       |  1 +
 execjs.gemspec                 |  5 +++-
 lib/execjs/duktape_runtime.rb  | 68 ++++++++++++++++++++++++++++++++++++++++++
 lib/execjs/external_runtime.rb |  9 +++++-
 lib/execjs/module.rb           |  4 +++
 lib/execjs/runtimes.rb         | 20 ++++++-------
 lib/execjs/version.rb          |  2 +-
 test/fixtures/coffee-script.js | 12 ++++----
 15 files changed, 152 insertions(+), 33 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-execjs.git