Merge branch 'bug_747_cancel_waiting_tasks'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Sep 2011 20:58:53 +0000 (22:58 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Sep 2011 20:58:53 +0000 (22:58 +0200)
commit75d5fba59f4e575eab24d1a6397a5904abed1101
treeb1e84f1bb4edb8de2307ca5e65b979f0913f47a2
parent8a25a8d1153800a868830d4813e277dcc490bcb7
parent9d1c22ed6298d6fa303f7e129d937df06e1bac7d
Merge branch 'bug_747_cancel_waiting_tasks'