[DRE-commits] [tdiary-contrib] 07/12: Merge tag 'upstream/4.0.5.1'

[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 3894a65438fc3b8d5a1d49f8204228618b3bb584
Merge: b145afe 9d07e62
Author: Hideki Yamane <henrich at debian.org>
Date:   Mon Sep 15 11:26:19 2014 +0900

    Merge tag 'upstream/4.0.5.1'
    
    Upstream version 4.0.5.1

 .travis.yml                                    |   6 +
 Gemfile                                        |  10 +-
 Gemfile.lock                                   |  38 ++---
 README.en.md                                   |   2 +-
 filter/commentsize.rb                          |   2 +-
 filter/iplookup.rb                             | 110 ++++++-------
 filter/plugin/commentsize.rb                   |   2 +-
 filter/plugin/en/spambayes.rb                  |   2 +-
 filter/plugin/iplookup.rb                      |  78 ++++-----
 filter/plugin/ja/antirefspam.rb                |   2 +-
 filter/plugin/ja/spambayes.rb                  |   2 +-
 filter/plugin/spambayes.rb                     |   2 +-
 filter/spambayes.rb                            |   2 +-
 js/flickr.js                                   |   2 +-
 lib/bayes.rb                                   |   2 +-
 lib/bayes/convert.rb                           |   2 +-
 lib/tdiary/contrib/version.rb                  |   2 +-
 lib/wgs2tky.rb                                 | 186 ++++++++++-----------
 plugin/appstore.rb                             |  12 +-
 plugin/bigpresen.rb                            |   6 +-
 plugin/bitly.rb                                |   2 +-
 plugin/brow_si.rb                              |   2 +-
 plugin/category_similar.rb                     |   2 +-
 plugin/category_to_tagcloud.rb                 |   4 +-
 plugin/coderay.rb                              |   2 +-
 plugin/datepicker.rb                           |   2 +-
 plugin/flickr.rb                               |   4 +-
 plugin/git-register.rb                         |  14 +-
 plugin/goo_gl.rb                               |  14 +-
 plugin/google_map.rb                           |  12 +-
 plugin/google_webmaster.rb                     |   8 +-
 plugin/hb_footer.rb                            |  10 +-
 plugin/hb_footer4sec.rb                        |  10 +-
 plugin/hide_sidebar_iphone.rb                  |   2 +-
 plugin/iddy.rb                                 |   2 +-
 plugin/image_ex.rb                             |  34 ++--
 plugin/image_gps.rb                            |   6 +-
 plugin/inline_wiki.rb                          |  12 +-
 plugin/instagr.rb                              |  16 +-
 plugin/instagram.rb                            |   2 +-
 plugin/ja/yo_update.rb                         |  51 ++++++
 plugin/jquery_ui_theme.rb                      |  16 +-
 plugin/jroku.rb                                |   2 +-
 plugin/jyear.rb                                |   4 +-
 plugin/makerss_category.rb                     |   8 +-
 plugin/makerss_comment.rb                      |   8 +-
 plugin/microsummary.rb                         |   4 +-
 plugin/nhk_program_info.rb                     |   4 +-
 plugin/picasa.rb                               |   4 +-
 plugin/playstore.rb                            |   6 +-
 plugin/rating.rb                               |  20 +--
 plugin/recent_estraier.rb                      |  14 +-
 plugin/search-bing.rb                          |   2 +-
 plugin/search-google-custom.rb                 |   2 +-
 plugin/search-yahoo-websearch.rb               |  16 +-
 plugin/search-yahoo.rb                         |   2 +-
 plugin/section_footer2.rb                      |   2 +-
 plugin/show_and_hide.rb                        |  40 ++---
 plugin/socialbutton.rb                         |   4 +-
 plugin/tdiarytimes.rb                          |  32 ++--
 plugin/tdiarytimes2.rb                         |  20 +--
 plugin/tdiarytimes_textstyle.rb                |   6 +-
 plugin/twitter_anywhere.rb                     | 102 ++++++------
 plugin/twitter_summary_card.rb                 |   2 +-
 plugin/vote.rb                                 |   8 +-
 plugin/yahoo_kousei.rb                         |   4 +-
 plugin/yo_update.rb                            | 214 +++++++++++++++++++++++++
 plugin/zenback.rb                              |   4 +-
 spec/apple_webclip_spec.rb                     |  12 +-
 util/estraier-search/estraier-register.rb      |   4 +-
 util/image-gallery/image-gallery.rb            |  16 +-
 util/image-gallery/misc/plugin/recent_image.rb |   8 +-
 util/posttdiary/posttdiary-ex.rb               |  14 +-
 util/rast-search/rast-register.rb              |   2 +-
 74 files changed, 774 insertions(+), 513 deletions(-)

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