[DRE-commits] [ruby-gollum-lib] 02/08: Merge tag 'upstream/4.2.0+debian'

[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 3bcc2d1b0a550e5e1fd1edaab7b05916e4d3ed1a
Merge: 8894e26 95bd976
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Oct 31 11:22:36 2016 +0530

    Merge tag 'upstream/4.2.0+debian'
    
    Upstream version 4.2.0+debian
    
    # gpg: Signature made Monday 31 October 2016 11:22:36 AM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 HISTORY.md                     |  5 ----
 gemspec.rb                     |  4 +--
 gollum-lib_java.gemspec        |  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 +-
 9 files changed, 43 insertions(+), 54 deletions(-)

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