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

[rbalint at users.alioth.debian.org]

Imported Upstream version 1.13.2+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: a1c0cbb8cb4ee1b2fd83d687d1a9512d7a442e47
X-Git-Newrev: 2f96cb31c1b36000a8e4e66ed0f9df04f697b2dd

The following commit has been merged in the master branch:
commit d2ea318bddc4c1239c0487d1892b4ae6f5b445b3
Merge: a1c0cbb8cb4ee1b2fd83d687d1a9512d7a442e47 01995ba0647596cdd7684f2879d023cdc7405118
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Mar 2 21:48:39 2016 +0100

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


-- 
kodi-pvr-mediaportal-tvserver packaging