From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 12 Feb 2010 13:23:06 +0000 (+0100)
Subject: Merge branch 'bug_411_timeshift_disable_without_live'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=a37ddbb7785de5f1d944f4937a5b2914ce6a3862

Merge branch 'bug_411_timeshift_disable_without_live'
---

a37ddbb7785de5f1d944f4937a5b2914ce6a3862