[SCM] kodi-pvr-nextpvr/master: Merge tag 'upstream/1.12.11+git20160301'

[rbalint at users.alioth.debian.org]

Imported Upstream version 1.12.11+git20160301
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2009ef15a8eba0f19721c72c986fcf05cb24b2a5
X-Git-Newrev: 435c49c0f5e72c189b873b42dc9ae2c92e57df75

The following commit has been merged in the master branch:
commit 6ee7ae633f3dc08940c4586dfb0f688c3b7ae07f
Merge: 2009ef15a8eba0f19721c72c986fcf05cb24b2a5 04951d9fd439cb57cbf0b3126755f8b7ead8a518
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Mar 3 14:15:57 2016 +0100

    Merge tag 'upstream/1.12.11+git20160301'
    
    Upstream version 1.12.11+git20160301
    
    Conflicts:
    	debian/changelog


-- 
kodi-pvr-nextpvr packaging