[DRE-commits] [ruby-github-markup] 01/04: Merge tag 'upstream/1.2.1+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 0c50e55ea9f39e260ee2bfc0a2f89b2a29f01315
Merge: 78cf6bc 5eb2fb3
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue May 20 14:28:25 2014 +0200

    Merge tag 'upstream/1.2.1+dfsg'
    
    Upstream version 1.2.1+dfsg
    
    # gpg: Signature faite le mar. 20 mai 2014 14:28:21 CEST avec la clef RSA d'identifiant 39CD217A
    # 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> »

 .gitignore                       |  3 +--
 HISTORY.md                       |  6 ++++++
 github-markup.gemspec            |  2 +-
 lib/github-markup.rb             |  2 +-
 lib/github/commands/rest2html    |  9 ++++++---
 test/markups/README.rst          |  7 ++++++-
 test/markups/README.rst.html     | 32 ++++++++++----------------------
 test/markups/README.rst.txt.html |  2 +-
 8 files changed, 32 insertions(+), 31 deletions(-)

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