Merge branch 'bug_747_cancel_waiting_tasks' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 11 Apr 2011 16:41:13 +0000 (18:41 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 11 Apr 2011 16:41:13 +0000 (18:41 +0200)
commite28d4d9a8ebe62ff5f2c2d603cb0b70be39dd42a
tree78ad3312933b7070f74cce064c61d3018e891d60
parent3c919c91a7778a049bad0317f6f7df86ff509415
parentb2646e4dddb270c125f7312c482e178279b9a395
Merge branch 'bug_747_cancel_waiting_tasks' into experimental