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.
add pubsubhubbub support to feed contacts
remove unneeded logger function
Complete oStatus conversations: Changed from file_get_contents to fetch_url
Merge pull request #721 from fabrixxm/master

uexport: fix full export
PL: update to the strings
ZH_CN: update to the strings
DE: update to the strings
CS: update to the strings
NL: translation added from transifex
Merge pull request #720 from fabrixxm/feed_push

Feed PuSH
PT_BR: update of the strings
FR: update of the strings
NL: update of the strings
Merge pull request #713 from annando/master

ejabberd and friendica
should fix #728
stupid typo