[DRE-commits] [ruby-tilt] 01/07: Merge branch 'upstream'

[Antonio Terceiro]

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

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

commit 1c2d34a17b419420c8b07ba77496e53bc05e9a9d
Merge: 6e2a896 2438b84
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Feb 23 12:06:36 2014 -0300

    Merge branch 'upstream'

 CHANGELOG.md                           |  17 --
 Gemfile                                |  59 +++--
 README.md                              |  72 ++++--
 Rakefile                               |  51 ++--
 docs/TEMPLATES.md => TEMPLATES.md      |  15 +-
 checksums.yaml.gz                      | Bin 269 -> 0 bytes
 docs/common.css                        |  14 --
 lib/tilt.rb                            | 241 ++++++++++++-------
 lib/tilt/asciidoc.rb                   |   9 +-
 lib/tilt/bluecloth.rb                  |  24 --
 lib/tilt/builder.rb                    |   9 +-
 lib/tilt/coffee.rb                     |   9 +-
 lib/tilt/creole.rb                     |  25 --
 lib/tilt/css.rb                        |  80 +++++++
 lib/tilt/csv.rb                        |  20 +-
 lib/tilt/erb.rb                        |  57 ++++-
 lib/tilt/erubis.rb                     |  43 ----
 lib/tilt/haml.rb                       |   9 +-
 lib/tilt/kramdown.rb                   |  33 ---
 lib/tilt/less.rb                       |  38 ---
 lib/tilt/liquid.rb                     |   9 +-
 lib/tilt/mapping.rb                    | 265 ---------------------
 lib/tilt/markaby.rb                    |   9 +-
 lib/tilt/markdown.rb                   | 214 +++++++++++++++++
 lib/tilt/maruku.rb                     |  22 --
 lib/tilt/nokogiri.rb                   |   9 +-
 lib/tilt/radius.rb                     |   9 +-
 lib/tilt/rdiscount.rb                  |  39 ----
 lib/tilt/rdoc.rb                       |  13 +-
 lib/tilt/redcarpet.rb                  | 104 ---------
 lib/tilt/sass.rb                       |  41 ----
 lib/tilt/template.rb                   | 181 ++++++++-------
 lib/tilt/{redcloth.rb => textile.rb}   |   9 +-
 lib/tilt/wiki.rb                       |  58 +++++
 lib/tilt/wikicloth.rb                  |  22 --
 lib/tilt/yajl.rb                       |   9 +-
 metadata.yml                           | 411 ++++++++++++++++++++++++++++++---
 test/{test_helper.rb => contest.rb}    |  18 +-
 test/tilt_asciidoctor_test.rb          |  12 +-
 test/tilt_blueclothtemplate_test.rb    |  18 +-
 test/tilt_buildertemplate_test.rb      |   6 +-
 test/tilt_cache_test.rb                |   4 +-
 test/tilt_coffeescripttemplate_test.rb |  26 ++-
 test/tilt_compilesite_test.rb          |   4 +-
 test/tilt_creoletemplate_test.rb       |  10 +-
 test/tilt_csv_test.rb                  |  14 +-
 test/tilt_erbtemplate_test.rb          |  14 +-
 test/tilt_erubistemplate_test.rb       |  14 +-
 test/tilt_etannitemplate_test.rb       |   7 +-
 test/tilt_fallback_test.rb             | 122 ++++++++++
 test/tilt_hamltemplate_test.rb         |   8 +-
 test/tilt_kramdown_test.rb             |  32 ++-
 test/tilt_lesstemplate_test.rb         |   6 +-
 test/tilt_liquidtemplate_test.rb       |   6 +-
 test/tilt_mapping_test.rb              | 229 ------------------
 test/tilt_markaby_test.rb              |   8 +-
 test/tilt_markdown_test.rb             |  44 ++--
 test/tilt_marukutemplate_test.rb       |  30 ++-
 test/tilt_metadata_test.rb             |  42 ----
 test/tilt_nokogiritemplate_test.rb     |   6 +-
 test/tilt_radiustemplate_test.rb       |   6 +-
 test/tilt_rdiscounttemplate_test.rb    |  26 ++-
 test/tilt_rdoctemplate_test.rb         |   8 +-
 test/tilt_redcarpettemplate_test.rb    |  34 ++-
 test/tilt_redclothtemplate_test.rb     |   6 +-
 test/tilt_sasstemplate_test.rb         |   8 +-
 test/tilt_stringtemplate_test.rb       |   7 +-
 test/tilt_template_test.rb             |  91 ++++----
 test/tilt_test.rb                      |  25 +-
 test/tilt_wikiclothtemplate_test.rb    |   6 +-
 test/tilt_yajltemplate_test.rb         |   6 +-
 tilt.gemspec                           |  51 ++--
 72 files changed, 1711 insertions(+), 1492 deletions(-)

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