From: Adam Sutton <dev@adamsutton.me.uk>
Date: Sat, 7 Jun 2014 21:54:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/374'
X-Git-Tag: v4.1~2000
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b271cca4e734c8689e414ab48805671a431083;p=thirdparty%2Ftvheadend.git

Merge remote-tracking branch 'origin/pr/374'
---

57b271cca4e734c8689e414ab48805671a431083