Merge branch 'bug_411_timeshift_disable_without_live' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:20:54 +0000 (14:20 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:20:54 +0000 (14:20 +0100)
commit4731ddecbf9d91941d9e4f0f43bf4504241596fb
tree91d8b666087bb090e250e06277cfb200569b8cdf
parent78dd965fb694fb8afa6d9ddc12cf45ae4645f848
parent83a674f998012f616a3ed7e7b7043e498fd93e09
Merge branch 'bug_411_timeshift_disable_without_live' into experimental