[SCM] kodi-pvr-dvbviewer/master: Merge tag 'upstream/2.4.6+dfsg1'

[rbalint at users.alioth.debian.org]

Imported Upstream version 2.4.6+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: 7dc37fee2ce10dd31b1a76fdf1c07ed2e38f25d8
X-Git-Newrev: 95b4a526407f52c5ccb86cf74f514c55edcab9a6

The following commit has been merged in the master branch:
commit a61b695243aae8ab473c8c465313420229eb6a2c
Merge: 30aef7520866885caa39ba344e1d1f1df5fc72ce 9fec83341fef2649d80e9eada0b589e092999724
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sat Dec 24 02:44:54 2016 +0100

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


-- 
kodi-pvr-dvbviewer packaging