[SCM] bristol/master: Fixup 'master' branch

[umlaeute at users.alioth.debian.org]

Import Debian patch 0.60.11-3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 681da27e9edec0abd74ef150aede33a36bab63d1
X-Git-Newrev: 75ad66e8c3c5f8d1bddc391dc020c0858153d6bf

The following commit has been merged in the master branch:
commit 75ad66e8c3c5f8d1bddc391dc020c0858153d6bf
Merge: a90388f843f73f6c8a57576068e4a8733589521f 681da27e9edec0abd74ef150aede33a36bab63d1
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Sep 9 22:06:06 2016 +0200

    Fixup 'master' branch
    
    Gbp-Dch: ignore


-- 
bristol packaging