Merge remote-tracking branch 'origin/bug_747_cancel_waiting_tasks'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:19:29 +0000 (15:19 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:19:29 +0000 (15:19 +0200)
commit80c9ad7d8d0e709d8bed740481b46ff23654fcaa
tree1e484a4613b7266a73eafdd99f13793e6e30d60d
parent4712fa7b44263f0e9517bb5a4b1729d922994572
parent2d3dfd7793532da77fc3f2cdb2b5bc282703dc15
Merge remote-tracking branch 'origin/bug_747_cancel_waiting_tasks'