Tribler/tribler — pull request #921 by egbertbouman (2014-11-13 12:57:59+00:00)
Title: Fix deadlock

Fix deadlock issue found by Mihai