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

[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 9d376009bdb7ba9b3b230f2423f0cbc20b2ccca7
Merge: 842021a 9e92d6b
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Feb 7 09:56:15 2014 -0300

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2
    
    # gpg: Signature made Sex 07 Fev 2014 09:56:12 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 <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"

 Rakefile                   |  2 +-
 lib/feed2imap/config.rb    |  2 +-
 lib/feed2imap/feed2imap.rb |  2 +-
 test/tc_config.rb          | 16 ++++++++++++++++
 test/tc_maildir.rb         |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

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