Merge lp://staging/~benlangfeld/ubuntu/precise/ejabberd/2.1.13 into lp://staging/ubuntu/precise/ejabberd

.git/FETCH_HEAD (+3/-0)
.git/HEAD (+1/-0)
.git/config (+13/-0)
.git/description (+1/-0)
.git/hooks/applypatch-msg.sample (+15/-0)
.git/hooks/commit-msg.sample (+24/-0)
.git/hooks/post-update.sample (+8/-0)
.git/hooks/pre-applypatch.sample (+14/-0)
.git/hooks/pre-commit.sample (+49/-0)
.git/hooks/pre-push.sample (+54/-0)
.git/hooks/pre-rebase.sample (+169/-0)
.git/hooks/prepare-commit-msg.sample (+36/-0)
.git/hooks/update.sample (+128/-0)
.git/info/exclude (+6/-0)
.git/logs/HEAD (+1/-0)
.git/logs/refs/heads/master (+1/-0)
.git/logs/refs/remotes/origin/HEAD (+1/-0)
.git/packed-refs (+141/-0)
.git/refs/heads/master (+1/-0)
.git/refs/remotes/origin/HEAD (+1/-0)
.gitignore (+3/-0)
README (+1/-1)
contrib/extract_translations/extract_translations.erl (+4/-4)
debian/NEWS (+19/-0)
debian/README.Debian (+42/-0)
debian/bzr-builddeb.conf (+2/-0)
debian/changelog (+121/-1)
debian/control (+6/-1)
debian/dirs (+1/-0)
debian/ejabberd.ufw.profile (+14/-0)
debian/logrotate (+1/-1)
debian/patches/ejabberd_regexp.patch (+95/-0)
debian/patches/ldap-filter-dnattributes.patch (+25/-0)
debian/patches/mod_admin_extra.patch (+31/-23)
debian/patches/reopen-log.patch (+1/-1)
debian/patches/series (+3/-0)
debian/patches/use_dpkg_buildflags.patch (+70/-0)
debian/po/it.po (+104/-0)
debian/po/sk.po (+104/-0)
debian/prerm (+10/-2)
debian/rules (+8/-6)
doc/api/overview.edoc (+1/-1)
doc/dev.html (+2/-2)
doc/features.html (+2/-2)
doc/guide.html (+115/-81)
doc/guide.tex (+84/-82)
doc/release_notes_2.1.11.txt (+58/-0)
doc/release_notes_2.1.12.txt (+67/-0)
doc/release_notes_2.1.13.txt (+29/-0)
doc/version.tex (+1/-1)
src/Makefile.win32 (+2/-2)
src/acl.erl (+12/-4)
src/adhoc.erl (+1/-1)
src/adhoc.hrl (+1/-1)
src/cache_tab.erl (+7/-2)
src/cache_tab_sup.erl (+1/-1)
src/configure (+11/-11)
src/configure.ac (+2/-2)
src/configure.erl (+1/-1)
src/cyrsasl.erl (+1/-1)
src/cyrsasl_anonymous.erl (+1/-1)
src/cyrsasl_digest.erl (+42/-13)
src/cyrsasl_plain.erl (+1/-1)
src/cyrsasl_scram.erl (+1/-1)
src/ejabberd.app (+1/-7)
src/ejabberd.cfg.example (+3/-0)
src/ejabberd.erl (+1/-1)
src/ejabberd.hrl (+1/-1)
src/ejabberd_admin.erl (+45/-7)
src/ejabberd_app.erl (+2/-1)
src/ejabberd_auth.erl (+1/-1)
src/ejabberd_auth_anonymous.erl (+1/-1)
src/ejabberd_auth_external.erl (+8/-15)
src/ejabberd_auth_internal.erl (+1/-1)
src/ejabberd_auth_ldap.erl (+1/-1)
src/ejabberd_auth_odbc.erl (+1/-1)
src/ejabberd_auth_pam.erl (+1/-1)
src/ejabberd_c2s.erl (+10/-7)
src/ejabberd_c2s_config.erl (+1/-1)
src/ejabberd_captcha.erl (+2/-2)
src/ejabberd_check.erl (+1/-1)
src/ejabberd_commands.erl (+3/-10)
src/ejabberd_commands.hrl (+1/-1)
src/ejabberd_config.erl (+33/-1)
src/ejabberd_config.hrl (+1/-1)
src/ejabberd_ctl.erl (+12/-1)
src/ejabberd_ctl.hrl (+1/-1)
src/ejabberd_frontend_socket.erl (+1/-1)
src/ejabberd_hooks.erl (+1/-1)
src/ejabberd_listener.erl (+3/-3)
src/ejabberd_local.erl (+1/-1)
src/ejabberd_logger_h.erl (+1/-1)
src/ejabberd_loglevel.erl (+1/-1)
src/ejabberd_node_groups.erl (+1/-1)
src/ejabberd_piefxis.erl (+36/-36)
src/ejabberd_rdbms.erl (+1/-1)
src/ejabberd_receiver.erl (+13/-5)
src/ejabberd_regexp.erl (+1/-1)
src/ejabberd_router.erl (+1/-1)
src/ejabberd_s2s.erl (+1/-1)
src/ejabberd_s2s_in.erl (+1/-1)
src/ejabberd_s2s_out.erl (+1/-1)
src/ejabberd_service.erl (+1/-1)
src/ejabberd_sm.erl (+1/-1)
src/ejabberd_socket.erl (+1/-1)
src/ejabberd_sup.erl (+1/-1)
src/ejabberd_system_monitor.erl (+1/-1)
src/ejabberd_tmp_sup.erl (+1/-1)
src/ejabberd_update.erl (+22/-16)
src/ejabberd_zlib/Makefile.win32 (+2/-2)
src/ejabberd_zlib/ejabberd_zlib.erl (+1/-1)
src/ejabberd_zlib/ejabberd_zlib_drv.c (+1/-1)
src/ejabberdctl.template (+15/-0)
src/ejd2odbc.erl (+207/-3)
src/eldap/eldap.erl (+1/-8)
src/eldap/eldap.hrl (+1/-1)
src/eldap/eldap_filter.erl (+2/-1)
src/eldap/eldap_pool.erl (+1/-1)
src/eldap/eldap_utils.erl (+1/-1)
src/expat_erl.c (+1/-1)
src/extauth.erl (+1/-1)
src/gen_iq_handler.erl (+1/-1)
src/gen_mod.erl (+15/-1)
src/idna.erl (+1/-1)
src/jd2ejd.erl (+11/-37)
src/jlib.erl (+1/-1)
src/jlib.hrl (+5/-1)
src/mod_adhoc.erl (+1/-1)
src/mod_announce.erl (+147/-43)
src/mod_blocking.erl (+226/-94)
src/mod_caps.erl (+8/-12)
src/mod_configure.erl (+6/-8)
src/mod_configure2.erl (+1/-1)
src/mod_disco.erl (+1/-1)
src/mod_echo.erl (+1/-1)
src/mod_ip_blacklist.erl (+1/-1)
src/mod_irc/Makefile.win32 (+2/-2)
src/mod_irc/iconv.erl (+1/-1)
src/mod_irc/iconv_erl.c (+1/-1)
src/mod_irc/mod_irc.erl (+141/-88)
src/mod_irc/mod_irc_connection.erl (+44/-13)
src/mod_last.erl (+47/-8)
src/mod_last_odbc.erl (+0/-204)
src/mod_muc/mod_muc.erl (+227/-63)
src/mod_muc/mod_muc_log.erl (+39/-9)
src/mod_muc/mod_muc_room.erl (+19/-9)
src/mod_muc/mod_muc_room.hrl (+2/-1)
src/mod_offline.erl (+347/-104)
src/mod_offline_odbc.erl (+0/-548)
src/mod_ping.erl (+1/-1)
src/mod_pres_counter.erl (+1/-1)
src/mod_privacy.erl (+475/-149)
src/mod_privacy.hrl (+1/-1)
src/mod_privacy_odbc.erl (+0/-863)
src/mod_private.erl (+142/-73)
src/mod_private_odbc.erl (+0/-136)
src/mod_proxy65/mod_proxy65.erl (+1/-1)
src/mod_proxy65/mod_proxy65.hrl (+1/-1)
src/mod_proxy65/mod_proxy65_lib.erl (+1/-1)
src/mod_proxy65/mod_proxy65_service.erl (+2/-2)
src/mod_proxy65/mod_proxy65_sm.erl (+1/-1)
src/mod_proxy65/mod_proxy65_stream.erl (+1/-1)
src/mod_pubsub/gen_pubsub_node.erl (+5/-5)
src/mod_pubsub/gen_pubsub_nodetree.erl (+5/-5)
src/mod_pubsub/mod_pubsub.erl (+56/-16)
src/mod_pubsub/mod_pubsub_odbc.erl (+40/-6)
src/mod_pubsub/node.template (+3/-3)
src/mod_pubsub/node_buddy.erl (+5/-5)
src/mod_pubsub/node_club.erl (+5/-5)
src/mod_pubsub/node_dispatch.erl (+5/-5)
src/mod_pubsub/node_flat.erl (+3/-3)
src/mod_pubsub/node_flat_odbc.erl (+3/-3)
src/mod_pubsub/node_hometree.erl (+14/-11)
src/mod_pubsub/node_hometree_odbc.erl (+5/-5)
src/mod_pubsub/node_mb.erl (+5/-5)
src/mod_pubsub/node_pep.erl (+5/-5)
src/mod_pubsub/node_pep_odbc.erl (+5/-5)
src/mod_pubsub/node_private.erl (+5/-5)
src/mod_pubsub/node_public.erl (+5/-5)
src/mod_pubsub/nodetree_tree.erl (+5/-5)
src/mod_pubsub/nodetree_tree_odbc.erl (+5/-5)
src/mod_pubsub/nodetree_virtual.erl (+5/-5)
src/mod_pubsub/pubsub.hrl (+9/-6)
src/mod_pubsub/pubsub_db_odbc.erl (+2/-2)
src/mod_pubsub/pubsub_index.erl (+5/-5)
src/mod_pubsub/pubsub_odbc.patch (+16/-16)
src/mod_pubsub/pubsub_subscription.erl (+6/-7)
src/mod_pubsub/pubsub_subscription_odbc.erl (+2/-2)
src/mod_register.erl (+1/-1)
src/mod_roster.erl (+542/-140)
src/mod_roster.hrl (+1/-1)
src/mod_roster_odbc.erl (+0/-1211)
src/mod_service_log.erl (+1/-1)
src/mod_shared_roster.erl (+258/-98)
src/mod_shared_roster_ldap.erl (+6/-3)
src/mod_sic.erl (+1/-1)
src/mod_stats.erl (+1/-1)
src/mod_time.erl (+1/-1)
src/mod_vcard.erl (+282/-95)
src/mod_vcard_ldap.erl (+4/-3)
src/mod_vcard_odbc.erl (+0/-653)
src/mod_vcard_xupdate.erl (+51/-7)
src/mod_version.erl (+1/-1)
src/msgs/ca.msg (+68/-23)
src/msgs/ca.po (+447/-375)
src/msgs/cs.msg (+18/-5)
src/msgs/cs.po (+370/-315)
src/msgs/de.msg (+25/-12)
src/msgs/de.po (+385/-327)
src/msgs/ejabberd.pot (+370/-315)
src/msgs/el.msg (+17/-4)
src/msgs/el.po (+371/-316)
src/msgs/eo.msg (+48/-4)
src/msgs/eo.po (+414/-356)
src/msgs/es.msg (+17/-4)
src/msgs/es.po (+377/-321)
src/msgs/fr.msg (+2/-3)
src/msgs/fr.po (+374/-316)
src/msgs/gl.msg (+2/-3)
src/msgs/gl.po (+376/-318)
src/msgs/he.msg (+283/-0)
src/msgs/he.po (+1927/-0)
src/msgs/id.msg (+2/-3)
src/msgs/id.po (+372/-314)
src/msgs/it.msg (+48/-3)
src/msgs/it.po (+424/-356)
src/msgs/ja.msg (+89/-76)
src/msgs/ja.po (+451/-402)
src/msgs/nl.msg (+48/-3)
src/msgs/nl.po (+411/-350)
src/msgs/no.msg (+48/-3)
src/msgs/no.po (+415/-353)
src/msgs/pl.msg (+19/-6)
src/msgs/pl.po (+375/-320)
src/msgs/pt-br.msg (+21/-10)
src/msgs/pt-br.po (+389/-332)
src/msgs/pt.po (+371/-313)
src/msgs/ru.msg (+16/-3)
src/msgs/ru.po (+372/-315)
src/msgs/sk.msg (+2/-3)
src/msgs/sk.po (+397/-369)
src/msgs/sv.msg (+1/-2)
src/msgs/sv.po (+374/-316)
src/msgs/th.po (+371/-313)
src/msgs/tr.msg (+54/-3)
src/msgs/tr.po (+420/-370)
src/msgs/uk.msg (+27/-26)
src/msgs/uk.po (+374/-314)
src/msgs/vi.po (+371/-313)
src/msgs/wa.po (+370/-312)
src/msgs/zh.msg (+32/-19)
src/msgs/zh.po (+388/-332)
src/odbc/ejabberd_odbc.erl (+11/-1)
src/odbc/ejabberd_odbc_sup.erl (+1/-1)
src/odbc/mssql2000.sql (+1/-1)
src/odbc/mssql2005.sql (+1/-1)
src/odbc/mysql.sql (+55/-1)
src/odbc/odbc_queries.erl (+15/-2)
src/odbc/pg.sql (+56/-1)
src/p1_fsm.erl (+3/-3)
src/p1_mnesia.erl (+1/-1)
src/p1_prof.erl (+1/-1)
src/pam/epam.c (+1/-1)
src/pam/epam.erl (+1/-1)
src/randoms.erl (+1/-1)
src/scram.erl (+1/-1)
src/sha.erl (+1/-1)
src/shaper.erl (+1/-1)
src/stringprep/Makefile.win32 (+2/-2)
src/stringprep/stringprep.erl (+1/-1)
src/stringprep/stringprep_drv.c (+1/-1)
src/stringprep/stringprep_sup.erl (+1/-1)
src/stun/ejabberd_stun.erl (+1/-1)
src/stun/stun.hrl (+1/-1)
src/stun/stun_codec.erl (+1/-1)
src/tls/Makefile.win32 (+2/-2)
src/tls/sha_drv.c (+1/-1)
src/tls/tls.erl (+23/-14)
src/tls/tls_drv.c (+122/-8)
src/translate.erl (+1/-1)
src/treap.erl (+1/-1)
src/web/ejabberd_http.erl (+160/-157)
src/web/ejabberd_http.hrl (+1/-1)
src/web/ejabberd_http_bind.erl (+52/-41)
src/web/ejabberd_http_poll.erl (+1/-1)
src/web/ejabberd_web.erl (+1/-1)
src/web/ejabberd_web_admin.erl (+12/-19)
src/web/ejabberd_web_admin.hrl (+1/-1)
src/web/http_bind.hrl (+1/-1)
src/web/mod_http_bind.erl (+3/-1)
src/web/mod_http_fileserver.erl (+3/-2)
src/web/mod_register_web.erl (+1/-1)
src/win32_dns.erl (+1/-1)
src/xml.erl (+1/-1)
src/xml_stream.erl (+22/-23)