[DRE-commits] [ruby-gollum-lib] 01/06: Merge tag 'upstream/4.2.0'

[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 537a771b757da579d7096c7a1c0c36e01fa1c533
Merge: 51f8260 5f2a8b2
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jun 2 16:01:26 2016 +0530

    Merge tag 'upstream/4.2.0'
    
    Upstream version 4.2.0
    
    # gpg: Signature made Thursday 02 June 2016 04:01:18 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                         |   9 +
 gemspec.rb                         |   8 +-
 gollum-lib_java.gemspec            |   2 +-
 lib/gollum-lib/committer.rb        |   2 +-
 lib/gollum-lib/filter/code.rb      |  46 ++---
 lib/gollum-lib/filter/tags.rb      |   2 +-
 lib/gollum-lib/filter/toc.rb       |  71 ++++---
 lib/gollum-lib/macro/global_toc.rb |   2 +-
 lib/gollum-lib/macro/navigation.rb |  20 ++
 lib/gollum-lib/page.rb             |   8 +
 lib/gollum-lib/version.rb          |   2 +-
 lib/gollum-lib/wiki.rb             |   3 +-
 metadata.yml                       | 411 -------------------------------------
 13 files changed, 119 insertions(+), 467 deletions(-)

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