[DRE-commits] [ruby-github-markup] 02/13: Merge tag 'upstream/1.1.2+dfsg'

[Cédric Boutillier]

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

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

commit 64ee5505688a5386a765b819766b66f939080f02
Merge: 7e87003 f730b97
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Apr 16 15:07:22 2014 +0200

    Merge tag 'upstream/1.1.2+dfsg'
    
    Upstream version 1.1.2+dfsg
    
    # gpg: Signature faite le mer. 16 avril 2014 15:07:11 CEST avec la clef RSA d'identifiant 8F9F8F09
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 Gemfile                            |  4 ++--
 HISTORY.md                         |  5 +++++
 github-markup.gemspec              |  6 ++++--
 lib/github-markup.rb               |  2 +-
 lib/github/commands/foo.rst        |  7 +++++++
 lib/github/commands/rest2html      | 35 ++++++++++++++++++++++++++++++++---
 lib/github/markups.rb              |  7 +++++--
 test/markups/README.mediawiki      | 24 ------------------------
 test/markups/README.mediawiki.html | 35 -----------------------------------
 test/markups/README.org            | 22 +++++++++++++++++++---
 test/markups/README.org.html       | 35 +++++++++++++++++++++++++----------
 test/markups/README.rst            | 22 ++++++++++++++++++++++
 test/markups/README.rst.html       | 25 ++++++++++++++++++++++++-
 13 files changed, 146 insertions(+), 83 deletions(-)

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