[DRE-commits] [tdiary-contrib] 01/07: Merge tag 'upstream/4.0.2.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 2ef29ddee78c0d2bee88b0e463a13c76fd2b68ac
Merge: 1296cf8 32d321c
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Dec 31 17:04:08 2013 +0900

    Merge tag 'upstream/4.0.2.1'
    
    Upstream version 4.0.2.1

 .gitignore                                         |    3 +-
 .travis.yml                                        |    9 +-
 Gemfile                                            |    4 +-
 Gemfile.lock                                       |   39 +-
 Rakefile                                           |    1 +
 doc/ja/plugin/image_detail.txt                     |   69 -
 doc/ja/plugin/image_gps.txt                        |   73 +-
 doc/ja/plugin/image_gps2.txt                       |   41 -
 doc/ja/plugin/playstore.txt                        |   31 +
 js/comment_emoji_autocomplete.js                   |  139 --
 js/socialbutton.js                                 |   17 +-
 lib/exifparser/BUGS                                |    1 -
 lib/exifparser/ChangeLog                           |  169 --
 lib/exifparser/README                              |   18 +-
 lib/exifparser/install.rb                          | 1015 ---------
 lib/exifparser/lib/exifparser.rb                   |  265 ---
 lib/exifparser/lib/exifparser/makernote/canon.rb   |  502 -----
 .../lib/exifparser/makernote/fujifilm.rb           |  415 ----
 lib/exifparser/lib/exifparser/makernote/minolta.rb |   84 -
 .../lib/exifparser/makernote/mk_nikonflensname.rb  |   39 -
 lib/exifparser/lib/exifparser/makernote/nikon.rb   |  267 ---
 lib/exifparser/lib/exifparser/makernote/nikon2.rb  |  581 -----
 .../lib/exifparser/makernote/nikonflensname.rb     |  438 ----
 lib/exifparser/lib/exifparser/makernote/olympus.rb |  225 --
 lib/exifparser/lib/exifparser/makernote/prove.rb   |   84 -
 lib/exifparser/lib/exifparser/makernote/sigma.rb   |  237 --
 lib/exifparser/lib/exifparser/pre-setup.rb         |    1 -
 lib/exifparser/lib/exifparser/scan.rb              |  274 ---
 lib/exifparser/lib/exifparser/tag.rb               | 2302 --------------------
 lib/exifparser/lib/exifparser/thumbnail.rb         |   76 -
 lib/exifparser/lib/exifparser/utils.rb             |   88 -
 lib/exifparser/sample/exifview.rb                  |  279 ---
 lib/tdiary-contrib.rb                              |   20 +
 lib/tdiary/contrib/version.rb                      |    5 +
 plugin/brow_si.rb                                  |   32 +
 plugin/comment_emoji_autocomplete.rb               |   27 -
 plugin/image_detail.rb                             |  143 --
 plugin/image_gps.rb                                |  166 +-
 plugin/instagr.rb                                  |    1 +
 plugin/instagram.rb                                |   10 +
 plugin/ohmsha_estore.rb                            |   15 +-
 plugin/playstore.rb                                |  178 ++
 plugin/puboo.rb                                    |   93 +
 plugin/rubykaigi.rb                                |    3 +-
 plugin/search-default.rb                           |   11 +-
 plugin/tweet_quote.rb                              |  173 +-
 plugin/twitter_badge.rb                            |    2 +-
 plugin/twitter_summary_card.rb                     |   56 +
 tdiary-contrib.gemspec                             |   26 +
 util/estraier-search/estraier-register.rb          |    3 +-
 util/estraier-search/estraier-search.rb            |    3 +-
 util/image-gallery/README.ja                       |    4 +-
 util/image-gallery/image-gallery.rb                |   43 +-
 util/image-gallery/image-gallery.rb.euc-jp         |   51 +-
 util/image-gallery/misc/plugin/recent_image.rb     |    8 +-
 util/image-gallery/skel/gallery.rhtml              |   26 +-
 util/image-gallery/skel/gallery.rhtml.euc-jp       |   26 +-
 57 files changed, 929 insertions(+), 7982 deletions(-)

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