Tribler/tribler — pull request #879 by LipuFei (2014-09-30 14:21:09+00:00)
Title: Refactory and fixes

DO NOT MERGE YET