[DRE-commits] [schleuder] 26/26: Merge tag 'upstream/3.0.2'

[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 ad2944ace8fa385462bc86aab22da6c042c8de47
Merge: 8398ce9 cc66f59
Author: Georg Faerber <georg at riseup.net>
Date:   Mon Feb 6 02:53:14 2017 +0100

    Merge tag 'upstream/3.0.2'
    
    Upstream version 3.0.2
    
    # gpg: Signature made Mon 06 Feb 2017 02:53:14 AM CET
    # 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                                | 19 +++++++++++++++++++
 Gemfile.lock                                |  2 +-
 README.md                                   |  8 ++++----
 etc/schleuder.cron.weekly                   |  4 +---
 lib/schleuder/cli.rb                        |  4 ++--
 lib/schleuder/version.rb                    |  2 +-
 locales/en.yml                              |  2 +-
 schleuder.gemspec                           |  2 +-
 spec/schleuder.yml                          |  2 +-
 spec/schleuder/integration/keywords_spec.rb |  2 +-
 spec/sks-mock.rb                            |  5 ++---
 spec/spec_helper.rb                         |  1 +
 12 files changed, 35 insertions(+), 18 deletions(-)

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