It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install.
Merge remote-tracking branch 'upstream/master'
Vier: Introductions are now shown. The popup menu when editing a profile is visible again.
Vier: A little rearrangement of the menu order.
Complete oStatus conversations: Changed from file_get_contents to fetch_url
Merge pull request #713 from annando/master

ejabberd and friendica