Tribler/tribler — pull request #366 by egbertbouman (2014-01-14 20:08:49+00:00)
Title: Main config

Please don't merge yet.