Tribler/dispersy — pull request #250 by whirm (2014-04-11 18:47:36+00:00)
Title: Next for devel

Rebased Tribler/next branch