[DRE-commits] [schleuder] 45/52: Merge tag 'upstream/3.0.1'

[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 2580f79d57fcb050b0c111526f71a15f0cf61a4f
Merge: b1af5b9 cc333b1
Author: Georg Faerber <georg at riseup.net>
Date:   Thu Jan 26 12:29:38 2017 +0100

    Merge tag 'upstream/3.0.1'
    
    Upstream version 3.0.1
    
    # gpg: Signature made Thu 26 Jan 2017 12:29:37 PM 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                   | 10 ++++++++++
 CODE_OF_CONDUCT.md             |  2 +-
 Gemfile.lock                   |  2 +-
 README.md                      | 13 +++++++------
 bin/schleuder-api-daemon       |  6 ++----
 lib/schleuder/version.rb       |  2 +-
 man/schleuder-api-daemon.8     |  3 +++
 man/schleuder-api-daemon.8.ron |  4 ++--
 8 files changed, 27 insertions(+), 15 deletions(-)

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