From: Andreas Öman <andreas@lonelycoder.com>
Date: Tue, 19 Jun 2012 18:27:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'adamsutton/master'
X-Git-Tag: 3.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ef72fb2760fa500a9260fabfd5760ce16ce0856;p=thirdparty%2Ftvheadend.git

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

4ef72fb2760fa500a9260fabfd5760ce16ce0856