[DRE-commits] [ruby-github-markup] 01/03: Merge tag 'upstream/1.4.0+dfsg'

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository ruby-github-markup.

commit 21ea33c4aa48c049fa611cd9e8f86c099d1bd3b1
Merge: 9793e26 2441dc7
Author: Balasankar C <balasankarc at autistici.org>
Date:   Wed Apr 13 10:09:57 2016 +0530

    Merge tag 'upstream/1.4.0+dfsg'
    
    Upstream version 1.4.0+dfsg

 CONTRIBUTING.md                             | 62 +++++++----------------------
 Gemfile                                     |  4 +-
 README.md                                   | 56 ++++++++++----------------
 lib/github-markup.rb                        |  2 +-
 lib/github/commands/rest2html               | 10 ++++-
 lib/github/markup.rb                        |  4 +-
 lib/github/markup/command_implementation.rb |  5 ++-
 lib/github/markup/gem_implementation.rb     |  4 ++
 lib/github/markup/markdown.rb               |  4 ++
 lib/github/markup/rdoc.rb                   | 15 ++++---
 lib/github/markups.rb                       | 20 ++++++----
 test/markup_test.rb                         | 14 ++++++-
 test/markups/README.asciidoc                | 11 ++++-
 test/markups/README.asciidoc.html           | 25 +++++++++++-
 test/markups/README.rst                     |  4 ++
 test/markups/README.rst.html                |  6 ++-
 16 files changed, 137 insertions(+), 109 deletions(-)

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