[SCM] kodi-pvr-mythtv/master: Merge tag 'upstream/4.12.12+dfsg1'

[rbalint at users.alioth.debian.org]

Imported Upstream version 4.12.12+dfsg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 704202d27717ff2f1b34be2afd2d73b15f12ecb7
X-Git-Newrev: 60a664ef1287aee1e8071b89ca1e2b4108d636aa

The following commit has been merged in the master branch:
commit 5ecd62bd22efbccafd7fd11175c6df85af8a1b04
Merge: de563595d572569efa65f4b826091f1dc64d5fd0 c9c7d8ad617458cc90c0b90509bb80f2402678c9
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Jan 25 15:35:12 2017 +0100

    Merge tag 'upstream/4.12.12+dfsg1'
    
    Upstream version 4.12.12+dfsg1
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/kodi-pvr-mythtv.install
    	debian/rules


-- 
kodi-pvr-mythtv packaging