Minor mod_version bugfix
Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.1.x
Fix reference to 'admin' ACL name (thanks to Samuel Wejeus)(EJAB-1476)
Improve spelling and fix some typos
One more fix
Room option to ignore private messages from visitors (thanks to Maxim Ignatenko)
Add ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
Document ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
Use #roster record instead of direct tuple
Fix typo in modules overview
Include status 110 in presence to new occupant (EJAB-740)
Handle case when ejabberd_auth_* says the account exists
Verify username provided in registration web form
Add comment about ping requests sent even to non-supporting clients
handle case when roster version on DB is enabled but version is not found.

Thanks Evgeniy.
Preliminary patch for SASL SCRAM-SHA-1 (thanks to Stephen Röttger)(EJAB-1196)
Indicate license and copyright (thanks to Stephen Röttger)(EJAB-1196)
Fix and improve support for SCRAM auth method (EJAB-1196)
Fix ODBC account counting (thanks to Artem Sh)(EJAB-1491)
Fix bug in scram is_alpha