[SCM] kodi-pvr-mediaportal-tvserver/master: Merge tag 'upstream/2.4.10+dfsg1'

[rbalint at users.alioth.debian.org]

Imported Upstream version 2.4.10+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: 78d463076168710f46eb6a48f6e87ab88e7209ee
X-Git-Newrev: 2bee711f98b5e8d3f9cee05888762782c6357960

The following commit has been merged in the master branch:
commit f47fe960106bcf76e27cd283b49c6b5fde933f9e
Merge: a8a818b5ffc9b2f8e24df4c61524736aee05c89f f8b9518a67d4692066b23a634a0a00117b288d12
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sat Dec 24 03:24:20 2016 +0100

    Merge tag 'upstream/2.4.10+dfsg1'
    
    Upstream version 2.4.10+dfsg1
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/kodi-pvr-mediaportal-tvserver.install
    	debian/rules
    	debian/source/format


-- 
kodi-pvr-mediaportal-tvserver packaging