[DRE-commits] [tdiary-contrib] 01/12: Merge tag 'upstream/4.0.4'

[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 39c488bb9d0444fe3a14d8b44a5600cd8974c1fc
Merge: 4e95523 49e4865
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Jun 3 21:36:38 2014 +0900

    Merge tag 'upstream/4.0.4'
    
    Upstream version 4.0.4

 Gemfile                     |  2 +-
 Gemfile.lock                | 10 +++++-----
 plugin/facebook_comments.rb |  2 +-
 plugin/flickr.rb            |  9 ++++++---
 4 files changed, 13 insertions(+), 10 deletions(-)

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