[DRE-commits] [feed2imap] 01/02: Merge tag 'upstream/1.2.5'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository feed2imap.

commit d878398b9f04ab8f07ad91ab917d3ff143ebc5a0
Merge: 888aa4e 4e029f1
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun May 10 20:46:28 2015 -0300

    Merge tag 'upstream/1.2.5'
    
    Upstream version 1.2.5
    
    # gpg: Signature made Dom 10 Mai 2015 20:46:25 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"

 lib/feed2imap/feed2imap.rb  |  2 +-
 lib/feed2imap/itemtomail.rb |  3 ++-
 test/tc_httpfetcher.rb      | 20 +++++++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

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