[SCM] kodi-pvr-hts/master: Merge pull request #189 from Jalle19/jarvis-merge-fixe

[tiber-guest at users.alioth.debian.org]

fix merge error which causes subscriptionSeek to fail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: da14e25d0ec59a47da93dd88bdc66e1c16d94238
X-Git-Newrev: 4dc398ff1337ec61dea38685719108f1cd20f7b0

The following commit has been merged in the master branch:
commit 97812528c4fda690ea57b476e4403cd51ce1aeba
Merge: f3ce630be03d508bf7b579e4c6517737eb89005e 9c524c5e027797d71def2a080a437890ae4b0ba6
Author: Sam Stenvall <Jalle19 at users.noreply.github.com>
Date:   Sun Jan 31 19:42:30 2016 +0200

    Merge pull request #189 from Jalle19/jarvis-merge-fixe
    
    Fix merge error which causes subscriptionSeek to fail


-- 
kodi-pvr-hts packaging