Fix MANIFEST.in
Merge branch 'master' of https://github.com/collective/collective.xmpp.core

Conflicts:
	MANIFEST.in
	docs/HISTORY.txt