Merge branch 'bug_263_fix_timeshift_live_transition'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:09:06 +0000 (16:09 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:09:06 +0000 (16:09 +0100)
commita13c7eb8d063f3fc68562dfa3ffb8cbfc814219e
treea475b69b096c17d774c07a2d849d3f1aa8bd10b1
parent864bab84ceacbaa2cf2814aa74f1379a0b9c8426
parent2eccebcc6bac4cd66864de0342fe4eede4029537
Merge branch 'bug_263_fix_timeshift_live_transition'