[DRE-commits] [feed2imap] 01/02: Merge tag 'upstream/1.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 1eb0ade5b225d51e5d4387e396ed757f261f0144
Merge: 725d0c8 6770b06
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 27 22:31:39 2013 -0300

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2
    
    # gpg: Signature made Ter 27 Ago 2013 22:31:36 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                   |    4 ++--
 lib/feed2imap/feed2imap.rb |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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