[SCM] kodi-pvr-njoy/master: Merge tag 'upstream/1.11.9+git20160210'

[rbalint at users.alioth.debian.org]

Imported Upstream version 1.11.9+git20160210
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5b0692ff5c4ce473348d0fb9906b28873f21cf03
X-Git-Newrev: 294b980c13271363f6fdd6a3f947c83f03dab6d6

The following commit has been merged in the master branch:
commit e0ccdccd572f4e60cab5f9041ee6356123ef3f80
Merge: 5b0692ff5c4ce473348d0fb9906b28873f21cf03 8944cc910368ec9ce89d67da25e51ca48e2378a2
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Mar 3 14:34:20 2016 +0100

    Merge tag 'upstream/1.11.9+git20160210'
    
    Upstream version 1.11.9+git20160210
    
    Conflicts:
    	debian/changelog


-- 
kodi-pvr-njoy packaging