fuck
fuck you
Merge branch 'master' of https://github.com/cc14514/ejabberd

Conflicts:
	v2.1.13/ejabberd.cfg