[DRE-commits] [ruby-slim] 01/06: Merge tag 'upstream/2.0.2'

[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-slim.

commit db7a03889df30999ccf39e925092dc51f8baa4ef
Merge: b6d387e 36cd39d
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Apr 10 20:58:34 2014 +0200

    Merge tag 'upstream/2.0.2'
    
    Upstream version 2.0.2

 .travis.yml                                   |   1 -
 CHANGES                                       |   4 ++
 README.md                                     |  55 ++++++++++++++------------
 checksums.yaml.gz                             | Bin 270 -> 269 bytes
 kill-travis.sh                                |  16 --------
 lib/slim/engine.rb                            |   2 +-
 lib/slim/parser.rb                            |  24 +++++------
 lib/slim/version.rb                           |   2 +-
 metadata.yml                                  |   8 ++--
 test/core/test_html_structure.rb              |  32 ++++++++++++---
 test/core/test_pretty.rb                      |   5 +--
 test/literate/TESTS.md                        |   6 +--
 test/rails/app/controllers/slim_controller.rb |   3 ++
 test/rails/app/helpers/application_helper.rb  |   3 ++
 test/rails/app/views/slim/helper.html.slim    |   4 ++
 test/rails/test/test_slim.rb                  |   8 ++++
 16 files changed, 97 insertions(+), 76 deletions(-)

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