[DRE-commits] [tdiary-contrib] 02/05: Merge tag 'upstream/4.0.3'

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository tdiary-contrib.

commit 1c9cc222a9e912a897868e0e913a41084604b7aa
Merge: 2fdf6be 56bfed8
Author: Hideki Yamane <henrich at debian.org>
Date:   Sun Mar 2 08:36:04 2014 +0900

    Merge tag 'upstream/4.0.3'
    
    Upstream version 4.0.3

 Gemfile                                        |   2 +-
 Gemfile.lock                                   |  28 +-
 lib/extensions/contrib.rb                      |  16 +
 lib/tdiary-contrib.rb                          |  14 +-
 lib/tdiary/contrib/version.rb                  |   4 +-
 plugin/coderay.rb                              |  74 ++++
 plugin/image_ex.rb                             |  32 +-
 plugin/makerss_category.rb                     |   4 +-
 plugin/makerss_comment.rb                      |   4 +-
 plugin/nhk_program_info.rb                     | 104 +++++
 plugin/profile.rb                              |  23 +-
 plugin/search-bing.rb                          |  16 +-
 plugin/search-default.rb                       | 269 -------------
 spec/apple_webclip_spec.rb                     |   6 +-
 spec/gist_spec.rb                              |   2 +-
 spec/github_link_spec.rb                       |   8 +-
 spec/google_analytics_spec.rb                  |   6 +-
 spec/jdate_spec.rb                             |   2 +-
 spec/jmonth_spec.rb                            |   2 +-
 spec/jyear_spec.rb                             |   2 +-
 spec/my_hotentry_spec.rb                       |  16 +-
 spec/openid_spec.rb                            |  68 ++--
 spec/opensearch_ad_spec.rb                     |  10 +-
 spec/profile_spec.rb                           |  30 +-
 spec/title_anchor_spec.rb                      |   8 +-
 spec/twitter_js_spec.rb                        |  16 +-
 spec/youtube_spec.rb                           |   2 +-
 tdiary-contrib.gemspec                         |   3 +-
 util/image-gallery/misc/plugin/recent_image.rb |   4 +-
 util/tdiarysearch/README.en                    |  53 ---
 util/tdiarysearch/README.ja                    |  99 -----
 util/tdiarysearch/search.rb                    | 504 -------------------------
 32 files changed, 340 insertions(+), 1091 deletions(-)

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