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

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.4.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8d1e3c2b37272bc3cb11996146210d70ac4829de
X-Git-Newrev: 0ee328b9e558d343010b11c8d9b6d747516411fe

The following commit has been merged in the master branch:
commit 261b497234254d36788040575bc36c12bfb74e6b
Merge: 191d26ed61248525a950b9677311a1fcc4336567 8088d02af13e01cda8201ee60a86520666666df8
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jan 17 14:45:05 2016 +0100

    Merge tag 'upstream/2.4.6'
    
    Upstream version 2.4.6
    
    # gpg: Signature made Sun 17 Jan 2016 14:45:02 CET using RSA key ID 6EA71993
    # 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