[DRE-commits] [atig] 02/03: Merge tag 'upstream/0.4.5'

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository atig.

commit 502def7c2cf7175540915dfe508ac4655633892a
Merge: b52a831 b8270bd
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Jun 4 18:00:24 2014 +0900

    Merge tag 'upstream/0.4.5'
    
    Upstream version 0.4.5
    
    Conflicts:
    	.travis.yml
    	Gemfile.lock
    	Rakefile
    	atig.gemspec
    	checksums.yaml.gz
    	docs/changelog.rst
    	docs/conf.py
    	docs/index.rst
    	docs/options.rst
    	lib/atig/agent/following.rb
    	lib/atig/ifilter/expand_url.rb
    	lib/atig/option.rb
    	lib/atig/version.rb
    	metadata.yml
    	spec/command/status_spec.rb
    	spec/ofilter/short_url_spec.rb
    	spec/spec_helper.rb

 .travis.yml                    |   2 ++
 Gemfile.lock                   |  34 +++++++++++++++++++---------------
 README.mkdn                    |   3 +--
 Rakefile                       |   6 +++---
 atig.gemspec                   |  10 +++++-----
 checksums.yaml.gz              | Bin 267 -> 270 bytes
 docs/changelog.rst             |  25 +++++++++++++++++++++++++
 docs/conf.py                   |   6 +++---
 docs/index.rst                 |   6 +++---
 docs/options.rst               |   4 ----
 docs/quickstart.rst            |   2 +-
 lib/atig.rb                    |   2 --
 lib/atig/agent/following.rb    |   6 +++---
 lib/atig/bitly.rb              |   1 -
 lib/atig/channel/timeline.rb   |   2 +-
 lib/atig/command/status.rb     |  14 ++++++++------
 lib/atig/db/sql.rb             |   1 -
 lib/atig/db/statuses.rb        |   1 -
 lib/atig/http.rb               |   3 +--
 lib/atig/ifilter/expand_url.rb |   1 -
 lib/atig/monkey.rb             |   1 -
 lib/atig/oauth.rb              |   3 +--
 lib/atig/ofilter/short_url.rb  |   4 ----
 lib/atig/option.rb             |   2 +-
 lib/atig/search.rb             |   3 +--
 lib/atig/stream.rb             |   1 -
 lib/atig/unu.rb                |  27 ---------------------------
 lib/atig/version.rb            |   2 +-
 metadata.yml                   |  37 +++++++++++++------------------------
 requirements.txt               |   5 +++++
 spec/command/status_spec.rb    |  27 ++++++++++++++++++---------
 spec/ofilter/short_url_spec.rb |  36 ------------------------------------
 spec/spec_helper.rb            |   7 +------
 33 files changed, 116 insertions(+), 168 deletions(-)

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