[DRE-commits] [schleuder] 01/02: Merge tag 'upstream/3.0.4'

[Georg Faerber]

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

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit 02bed29ec5e62094bba516a45cf6aae358aa44f9
Merge: 61618ad c5b1a6d
Author: Georg Faerber <georg at riseup.net>
Date:   Sat Jun 10 17:50:55 2017 +0200

    Merge tag 'upstream/3.0.4'
    
    Upstream version 3.0.4
    
    # gpg: Signature made Sat 10 Jun 2017 05:50:54 PM CEST
    # gpg:                using RSA key E29DD0FBEC9607D963BDAE0D5AD75B414EA41667
    # gpg: Good signature from "Georg Faerber <georg at riseup.net>" [ultimate]
    # Primary key fingerprint: E29D D0FB EC96 07D9 63BD  AE0D 5AD7 5B41 4EA4 1667

 CHANGELOG.md                             | 14 ++++++++++++
 Gemfile.lock                             |  5 ++++-
 README.md                                |  8 +++----
 bin/schleuder-api-daemon                 |  8 +++----
 lib/schleuder/gpgme/ctx.rb               |  2 +-
 lib/schleuder/list.rb                    |  2 ++
 lib/schleuder/mail/message.rb            |  4 +++-
 lib/schleuder/plugins_runner.rb          |  5 ++---
 lib/schleuder/version.rb                 |  2 +-
 locales/de.yml                           |  4 ++--
 locales/en.yml                           |  6 ++---
 spec/fixtures/olduid_key.txt             | 30 +++++++++++++++++++++++++
 spec/fixtures/olduid_key_with_newuid.txt | 38 ++++++++++++++++++++++++++++++++
 spec/schleuder/integration/cli_spec.rb   |  6 +++--
 spec/schleuder/unit/list_spec.rb         | 12 ++++------
 spec/sks-mock.rb                         |  2 ++
 16 files changed, 118 insertions(+), 30 deletions(-)

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