[SCM] kodi-pvr-iptvsimple/master: Merge tag 'upstream/1.12.11+git20160220'

[rbalint at users.alioth.debian.org]

Imported Upstream version 1.12.11+git20160220
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e8ecd63b286525d7aec018d3f02ca50ff0de6858
X-Git-Newrev: 5a3e9af0d092f4dcbc989e2d6e0516d82fbd4fb2

The following commit has been merged in the master branch:
commit 0e3b0dcab50931abae61035211c1d348eb2a2a72
Merge: e8ecd63b286525d7aec018d3f02ca50ff0de6858 b2e6d5c9d8652441aa2d5c64c3e4fb2704dc316b
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Mar 2 21:23:06 2016 +0100

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


-- 
kodi-pvr-iptvsimple packaging