Removed bookmark autojoin limit
Merge branch 'master' into xep-0223

Conflicts:
	src/xmpp/bookmark.c