[DRE-commits] [ruby-twitter-text] 01/02: Merge tag 'upstream/1.13.0+conformance'

[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 b461107b3729daaf3f7730a7180159627434a8e3
Merge: 36b1f10 f978c8b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Oct 28 20:20:08 2015 +0530

    Merge tag 'upstream/1.13.0+conformance'
    
    Upstream version 1.13.0+conformance
    
    # gpg: Signature made Wednesday 28 October 2015 08:20:03 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          | 324 +++++++++++++++++++++++++++++-----------
 lib/twitter-text/autolink.rb    |  11 +-
 lib/twitter-text/hash_helper.rb |   2 +-
 lib/twitter-text/regex.rb       |   4 +-
 lib/twitter-text/validation.rb  |   4 +-
 metadata.yml                    |   6 +-
 spec/test_urls.rb               |   3 +-
 twitter-text.gemspec            |   2 +-
 8 files changed, 252 insertions(+), 104 deletions(-)

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