From: Adam Sutton <dev@adamsutton.me.uk>
Date: Mon, 18 Jan 2016 09:57:31 +0000 (+0000)
Subject: Merge PR #788
X-Git-Tag: v4.2.1~1162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf487f5a04d29b68ec8be6a4eeca488e9deb4658;p=thirdparty%2Ftvheadend.git

Merge PR #788

remote-tracking branch 'upstream/pr/788'
---

bf487f5a04d29b68ec8be6a4eeca488e9deb4658