Merge dispersy.
Merge branch 'devel' of github.com:Tribler/tribler into devel
Merge branch 'devel' of github.com:Tribler/tribler into devel
Change in dispersy.
new dispersy
Removed getSwarmInfo() in TorrentDBHandler.
Merge pull request #343 from LipuFei/db-cleanup

Db cleanup