Merge branch 'bug_411_timeshift_disable_without_live'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:23:06 +0000 (14:23 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:23:06 +0000 (14:23 +0100)

No differences found