Tribler/tribler — pull request #805 by egbertbouman (2014-08-28 14:09:13+00:00)
Title: Trying to fix unit test

DO NOT MERGE