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

[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 2f2f7b3a3638d6760720dc8d22f85777a0ec1816
Merge: e9943e6 d4002b2
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun May 3 20:41:52 2015 -0300

    Merge tag 'upstream/1.2.4'
    
    Upstream version 1.2.4
    
    # gpg: Signature made Dom 03 Mai 2015 20:41:49 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>"

 Rakefile                   | 68 +++++++++++++++++++++++-----------------------
 lib/feed2imap/config.rb    |  1 +
 lib/feed2imap/feed2imap.rb | 37 +++++++++++++------------
 test/tc_config.rb          | 15 ++++++++++
 test/ts_feed2imap.rb       | 12 --------
 5 files changed, 70 insertions(+), 63 deletions(-)

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