From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 24 May 2014 20:21:32 +0000 (+0200)
Subject: Merge commit 'c3772ce7a2c43097dc16dac3b41ccd726e150d56'
X-Git-Tag: v4.1~2059
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44d17ae601e827775318838b6c4efea9efa7fa2e;p=thirdparty%2Ftvheadend.git

Merge commit 'c3772ce7a2c43097dc16dac3b41ccd726e150d56'
---

44d17ae601e827775318838b6c4efea9efa7fa2e