Tribler/tribler — pull request #238 by whirm (2013-07-18 10:59:31+00:00)
Title: Fix for ubunutu feedparser import

Conflicts:
Tribler/Main/Utility/Feeds/rssparser.py