[DRE-commits] [ruby-html2haml] 01/09: Merge tag 'upstream/2.0.0'

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-html2haml.

commit 22e3c98e6fb6019559e2823de2c3e6d9998d759f
Merge: 3648e1a 9f21050
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Sep 9 17:22:56 2015 +0200

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0

 .travis.yml                  |   8 +-
 .yardopts                    |   1 +
 Changelog.markdown           |  20 +++
 MIT-LICENSE                  |   2 +-
 README.md                    |  40 ++++-
 Rakefile                     |   8 +-
 html2haml.gemspec            |  12 +-
 lib/html2haml/exec.rb        |  35 ++--
 lib/html2haml/html.rb        | 401 ++++++++++++++++++++++++++++---------------
 lib/html2haml/html/erb.rb    |  42 ++---
 lib/html2haml/version.rb     |   2 +-
 metadata.yml                 | 233 ++++++++++++-------------
 test/erb_test.rb             |  86 ++++++++--
 test/html2haml_test.rb       |  98 +++++++++--
 test/jruby/erb_test.rb       |  28 +++
 test/jruby/html2haml_test.rb |  72 ++++++++
 test/test_helper.rb          |   2 +-
 17 files changed, 736 insertions(+), 354 deletions(-)

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