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

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b292a0184888b1c4209e806c46497b77da889bb6
X-Git-Newrev: 869cda6381a7ddac4e2442e58b8a819db7f76cd8

The following commit has been merged in the master branch:
commit c5446c2ac0dcaa940364732426b5e819691bf262
Merge: b292a0184888b1c4209e806c46497b77da889bb6 13320572e0d0e168ffb50565e5f9d2a5ce44b8bf
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Feb 22 18:08:21 2016 +0100

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0
    
    # gpg: Signature made Mon 22 Feb 2016 18:08:17 CET using RSA key ID 6EA71993
    # gpg: please do a --check-trustdb
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>"
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>"
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>"


-- 
lives packaging