Merge branch 'bug_612_fix_timeshift_stop' into 3.0
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 15:58:28 +0000 (16:58 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 15:58:28 +0000 (16:58 +0100)
commitd9b377f518c0f8da868e0f40b8fcfd6799cbef62
treed94ff76e16873278e837f0919f85c9edf9a3b7d5
parent2e31046a8173d277326b070b7fdb99c95a1a9a84
parenta83125b3e0f7fcfcb06f19e2d1eb086ba792d227
Merge branch 'bug_612_fix_timeshift_stop' into 3.0