From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 5 Mar 2014 08:50:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/pr/330'
X-Git-Tag: v4.1~2256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d1fc2bbaa42c527b0154f883595956f12b6009e;p=thirdparty%2Ftvheadend.git

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

Fixes #1983
---

1d1fc2bbaa42c527b0154f883595956f12b6009e