nil
xmpp
nil
nil
nil
nil
nil
nil
Merge branch 'new_xmpp'

Conflicts:
	bin/xmpp.rb
	main.tin
	plugin/xmpp.tin