[SCM] qm-dsp/master: Merge 'master' branches

[umlaeute at users.alioth.debian.org]

Fix copyright file.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 95aaf1a87b88db7889a890111c1472813a3e24fe
X-Git-Newrev: ab4393921b46d53c0c510005c0ab50480012e254

The following commit has been merged in the master branch:
commit ab4393921b46d53c0c510005c0ab50480012e254
Merge: 7604246071b619f761f2143a058210686cd90a18 95aaf1a87b88db7889a890111c1472813a3e24fe
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Dec 15 21:10:48 2016 +0100

    Merge 'master' branches
    
    Gbp-Dch: ignore


-- 
qm-dsp packaging