Tribler/tribler — pull request #370 by whirm (2014-01-16 15:27:59+00:00)
Title: Misc minor fixes

Some stuff I had stashed away