[DRE-commits] [ruby-twitter-text] 01/05: Merge tag 'upstream/1.12.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-twitter-text.

commit c7b28722061f6b64f4ef9f68a6d0d85311373a24
Merge: 66527aa 8b804e8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jul 28 14:44:37 2015 +0530

    Merge tag 'upstream/1.12.0'
    
    Upstream version 1.12.0
    
    # gpg: Signature made Tuesday 28 July 2015 02:44:32 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>"

 lib/assets/tld_lib.yml                             |  298 +-
 lib/twitter-text/autolink.rb                       |    2 +-
 lib/twitter-text/regex.rb                          |    4 +-
 lib/twitter-text/rewriter.rb                       |   10 +-
 metadata.yml                                       |    6 +-
 test/twitter-text-conformance/Gemfile              |    3 -
 test/twitter-text-conformance/Gemfile.lock         |   12 -
 test/twitter-text-conformance/LICENSE              |  188 --
 test/twitter-text-conformance/README.md            |  111 -
 test/twitter-text-conformance/Rakefile             |   88 -
 test/twitter-text-conformance/TldLists.java        |  798 -----
 test/twitter-text-conformance/autolink.yml         |  777 -----
 test/twitter-text-conformance/extract.yml          |  933 ------
 test/twitter-text-conformance/hit_highlighting.yml |   73 -
 test/twitter-text-conformance/tld_lib.yml          |  787 -----
 test/twitter-text-conformance/tlds.yml             | 3140 --------------------
 test/twitter-text-conformance/validate.yml         |  240 --
 twitter-text.gemspec                               |    2 +-
 18 files changed, 230 insertions(+), 7242 deletions(-)

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