[DRE-commits] [ruby-twitter-text] 01/03: Merge tag 'upstream/1.10.0'

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository ruby-twitter-text.

commit 89da5f404a3f89e7dc930c36c4275e2e8cd3c198
Merge: 294908a 5a54adb
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Nov 1 22:31:46 2014 +0900

    Merge tag 'upstream/1.10.0'
    
    Upstream version 1.10.0

 lib/twitter-text.rb                 |  2 +-
 lib/twitter-text/extractor.rb       |  1 -
 lib/twitter-text/hit_highlighter.rb |  4 +--
 lib/twitter-text/regex.rb           | 52 +++++++++++--------------------------
 lib/twitter-text/rewriter.rb        |  4 +--
 lib/twitter-text/validation.rb      |  2 +-
 test/conformance_test.rb            |  8 ++++++
 twitter-text.gemspec                |  4 +--
 8 files changed, 31 insertions(+), 46 deletions(-)

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