RuudBurger/CouchPotatoServer — pull request #3356 by MartijnBraam (2014-06-03 14:34:50+00:00)
Title: Renamed xmpp.py to avoid conflict with importing

This fixes #3318