From: Andreas Öman <andreas@lonelycoder.com>
Date: Mon, 21 Mar 2011 21:43:09 +0000 (+0100)
Subject: Merge remote branch 'remotes/jdembski/add_update_timer'
X-Git-Tag: 2.99~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbcd2232c72ffa789646dfa988319207e64c834e;p=thirdparty%2Ftvheadend.git

Merge remote branch 'remotes/jdembski/add_update_timer'
---

dbcd2232c72ffa789646dfa988319207e64c834e