Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
Merge branch 'master' into frodo
[tvheadend] added working seek support.
[tvheadend] ensure timeshiftStatus does not spam logs
[mythtv-cmyth] Release v1.6.9

- Added Live TV vs. recording conflict handling
- Fixed recovering from backend connection loss on Windows
- Fixed error when trying to set watched flag for recordings that already have been marked as watched
[tvheadend] update subscriptionSeek call to use abs PTS
[tvheadend] correct previous mistaken fix to webroot processing
[tvheadend] update addon version info
[tvheadend] fix return PTS when skipping
updated README for windows
Merge pull request #175 from adamsutton/pvr-hts-keep_opdenkamp_happy

webroot fix and updated seek support