mod_tls: Rename variables to be less confusing
mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if they differ
package{,c}path fixes for migration tools
additional fix for erlparse loading in ejabberd2prosody.lua
tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.
tools/ejabberd2prosody: Add support for importing MUC rooms.
MUC: Split saving to history into a separate method
MUC: Split out sending of the topic into method separate from sending history
MUC: Expose room metatable on module
mod_storage_sql2: Fix SQL syntax
Merge 0.10->trunk
Merge 0.9->0.10
Merge 0.10->trunk