Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Feb 2011 14:12:29 +0000 (15:12 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Feb 2011 14:12:29 +0000 (15:12 +0100)
commitfa6d60737fd7c0ba429b07d954c1a0f376fe5566
treea3f9a9225f33afaa3f1b2e02270fbf2f788ff314
parentf0fa458aa15610408a16f3214a6e857f16b0c646
parentad4c850143eee2e993d1637a12d9418279ac32d3
Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer'