From: Bernhard Froehlich <decke@bluelife.at>
Date: Fri, 24 May 2013 17:03:40 +0000 (+0200)
Subject: Sync with tvheadend/master and merge in changes.
X-Git-Tag: v3.9~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5691e131a95511a6a91c04c66710e996317be316;p=thirdparty%2Ftvheadend.git

Sync with tvheadend/master and merge in changes.
---

5691e131a95511a6a91c04c66710e996317be316