[SCM] lives/master: Merge tag 'upstream/2.8.5'

[sramacher at users.alioth.debian.org]

New upstream version 2.8.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 36c4823c642d85e370e7e10441f2af7b2d6e7858
X-Git-Newrev: e083e2624f5bfce4f5057a9138977cb6f7714375

The following commit has been merged in the master branch:
commit 479401ac48cfa2ba02962ce1c8cdecd15e30cd87
Merge: 36c4823c642d85e370e7e10441f2af7b2d6e7858 aaf8a6c335d3913b72a24003a733844ec7316004
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue May 2 18:55:16 2017 +0200

    Merge tag 'upstream/2.8.5'
    
    Upstream version 2.8.5
    
    # gpg: Signature made 2017-05-02T18:55:16 CEST
    # gpg:                using RSA key F78CBA07817BB149A11D339069F2FC516EA71993
    # gpg:                issuer "sramacher at debian.org"
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>" [ultimate]


-- 
lives packaging