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

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

d152b6c8e23c6adaf2b5ece819f848cf314525d8