Tribler/dispersy — pull request #323 by whirm (2014-06-04 13:35:00+00:00)
Title: misc fixes

DO NOT MERGE YET