Merge branch 'master' of https://github.com/camporez/tpb2rss

Conflicts:
	tpb2rss.py
Merge branch 'master' of https://github.com/camporez/tpb2rss

Conflicts:
	tpb2rss.py