Merge branch 'bug_612_fix_timeshift_stop' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 15:58:33 +0000 (16:58 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 15:58:33 +0000 (16:58 +0100)
commit6ffeb78ed56b36199450bc8dc585c98f7234e600
tree4a0bf2dbbd5f07c679e07dbe54071ed710d50199
parente246e0ded446974b388f1e819bdbdb446ae4429f
parenta83125b3e0f7fcfcb06f19e2d1eb086ba792d227
Merge branch 'bug_612_fix_timeshift_stop' into experimental