From: John Törnblom <john.tornblom@gmail.com>
Date: Thu, 8 Nov 2012 20:35:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.5~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcaf92e1ab6cc6dfa8eb8671d8e4545601610aa1;p=thirdparty%2Ftvheadend.git

Merge remote-tracking branch 'upstream/master'
---

fcaf92e1ab6cc6dfa8eb8671d8e4545601610aa1