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

[Antonio Terceiro]

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

terceiro pushed a commit to annotated tag debian/1.1-1
in repository feed2imap.

commit ffc7f46f082c05b46de5c5c2ee55d2c95afaaa1c
Merge: 6542ad4 c070d2f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Aug 25 19:36:59 2013 -0300

    Merge tag 'upstream/1.1'
    
    Upstream version 1.1
    
    # gpg: Signature made Dom 25 Ago 2013 19:36:57 BRT using DSA key ID 0F9CB28F
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro (DCC/UFBA) <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro (Colivre) <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"

 Rakefile                                        |   18 +-
 data/doc/feed2imap/examples/feed2imaprc         |    7 +
 lib/feed2imap/cache.rb                          |   26 +-
 lib/feed2imap/config.rb                         |   66 +-
 lib/feed2imap/feed2imap.rb                      |    8 +-
 lib/feed2imap/httpfetcher.rb                    |   36 +-
 lib/feed2imap/imap.rb                           |   11 +-
 lib/feed2imap/itemtomail.rb                     |   24 +-
 lib/feed2imap/maildir.rb                        |   45 +-
 lib/feed2imap/rexml_patch.rb                    |    2 +-
 lib/feed2imap/rubyimap.rb                       | 3601 -----------------------
 test/maildir/cur/1376317520.15784_1.debian:2,S  |   11 +
 test/maildir/cur/1376319137.17850_1.debian:2,   |   11 +
 test/maildir/cur/1376320022.18396_5.debian:2,FS |   11 +
 test/maildir/new/1376320099.18396_7.debian      |   11 +
 test/tc_config.rb                               |   18 +
 test/tc_mail.rb                                 |   14 -
 test/tc_maildir.rb                              |   93 +
 18 files changed, 324 insertions(+), 3689 deletions(-)

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