Set dnAttributes on when it's requested by a filter
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on each startup.
Merge pull request #268 from benlangfeld/fix/ldap_filter_dnattributes_new_ejabberd

Set dnAttributes on when it's requested by a filter
Merge pull request #269 from Iperity/master

Fix migration of pubsub nodes. Was deleting and re-creating all nodes on...
Merge pull request #276 from weiss/xep-0198

XEP-0198: Don't crash if the resume ID is incorrect
Merge pull request #277 from weiss/xep-0198

XEP-0198: Create shorter session resume IDs
Store persistent MUC room during creation

Make sure persistent rooms are stored to the database.  Without this
change, a room got lost if the 'persistent' flag was handed over to
mod_muc:create_room/5 and the server was then restartet before any
activity took place in that room.
Merge pull request #280 from weiss/store-persistent-muc-on-init

Store peristent MUC room during creation
Fix MUC option docs: "infinity", not "infinite"
Allow for "max_ack_queue: infinity", as documented
Merge pull request #282 from weiss/fix-muc-option-docs

Fix MUC option docs: "infinity", not "infinite"
Merge pull request #283 from weiss/allow-unlimited-ack-queue

Support "max_ack_queue: infinity"
Guide: For consistency, use 'infinity' everywhere
Merge pull request #284 from weiss/infinity-vs-unlimited

Guide: For consistency, use 'infinity' everywhere
fix 404 on pep first publishing with odbc
Merge pull request #286 from vesvalo/fix_pep_odbc_publishing

fix 404 on pep first publishing with odbc
Fix return value of mod_shared_roster:delete_group. Current one is not compatible with mod_admin_extra.
Merge pull request #287 from vesvalo/master

Fix return value of mod_shared_roster:delete_group.
Fix an XEP reference in the guide
Fix a comment in ejabberd_hooks