Merge branch 'bug_263_fix_timeshift_live_transition' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Dec 2009 18:55:31 +0000 (19:55 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Dec 2009 18:55:31 +0000 (19:55 +0100)
commit67a9cce495c089020439834bb27cd148296c3655
tree6af7b7729bd3020872c473db52fc797a269979e2
parentd4426631ae17978c6bb8121e1ca826e16eccc6de
parent2eccebcc6bac4cd66864de0342fe4eede4029537
Merge branch 'bug_263_fix_timeshift_live_transition' into experimental