[DRE-commits] [ruby-gollum-lib] 01/02: Merge tag 'upstream/4.2.1'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-gollum-lib.

commit 689da23b2aad6048f7defbeb6e2d816cf86acc3f
Merge: 4e6802b 9400e35
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jul 14 12:54:53 2016 +0530

    Merge tag 'upstream/4.2.1'
    
    Upstream version 4.2.1
    
    # gpg: Signature made Thursday 14 July 2016 12:54:48 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 HISTORY.md                     |  5 ++++
 gemspec.rb                     |  4 +--
 lib/gollum-lib.rb              |  1 +
 lib/gollum-lib/file.rb         |  1 -
 lib/gollum-lib/filter/code.rb  | 21 +++++++++-------
 lib/gollum-lib/page.rb         | 57 +++++++++++++++++++++---------------------
 lib/gollum-lib/sanitization.rb |  2 +-
 lib/gollum-lib/version.rb      |  2 +-
 8 files changed, 50 insertions(+), 43 deletions(-)

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