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

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

Fixes #2115
---

aad7b63138837b2284bbc831666892ba4af6c766