Merge branch 'bug_411_timeshift_disable_without_live' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 22 Jan 2010 14:07:57 +0000 (15:07 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 22 Jan 2010 14:07:57 +0000 (15:07 +0100)
commit59dece7572bea6bb8aa0391c32774363c62fd71e
treed779e8732e3f27903956338a61e8f90ccfc5e171
parent6551b5fbbed0acb407e3eba5c9c510ca74e352f7
parent39bcbbae7cd1d2db59ddbf6cbae665313a322f3a
Merge branch 'bug_411_timeshift_disable_without_live' into experimental