Merge pull request #146 from jamielinux/master

Update FSF address

diff --cc include/adhoc.hrl
Simple merge

diff --cc include/ejabberd.hrl
Simple merge

diff --cc include/ejabberd_commands.hrl
Simple merge

diff --cc include/ejabberd_config.hrl
Simple merge

diff --cc include/ejabberd_ctl.hrl
Simple merge

diff --cc include/ejabberd_http.hrl
Simple merge

diff --cc include/ejabberd_web_admin.hrl
Simple merge

diff --cc include/eldap.hrl
Simple merge

diff --cc include/http_bind.hrl
Simple merge

diff --cc include/jlib.hrl
Simple merge

diff --cc include/logger.hrl
Simple merge

diff --cc include/mod_muc_room.hrl
Simple merge

diff --cc include/mod_privacy.hrl
Simple merge

diff --cc include/mod_proxy65.hrl
Simple merge

diff --cc include/mod_roster.hrl
Simple merge

diff --cc include/ns.hrl
Simple merge

diff --cc sql/mssql2000.sql
Simple merge

diff --cc sql/mssql2005.sql
Simple merge

diff --cc sql/mssql2012.sql
Simple merge

diff --cc sql/mysql.sql
Simple merge

diff --cc sql/pg.sql
Simple merge

diff --cc src/acl.erl
Simple merge

diff --cc src/adhoc.erl
Simple merge

diff --cc src/cyrsasl.erl
Simple merge

diff --cc src/cyrsasl_anonymous.erl
Simple merge

diff --cc src/cyrsasl_digest.erl
Simple merge

diff --cc src/cyrsasl_plain.erl
Simple merge

diff --cc src/cyrsasl_scram.erl
Simple merge

diff --cc src/ejabberd.erl
Simple merge

diff --cc src/ejabberd_admin.erl
Simple merge

diff --cc src/ejabberd_app.erl
Simple merge

diff --cc src/ejabberd_auth.erl
Simple merge

diff --cc src/ejabberd_auth_anonymous.erl
Simple merge

diff --cc src/ejabberd_auth_external.erl
Simple merge

diff --cc src/ejabberd_auth_internal.erl
Simple merge

diff --cc src/ejabberd_auth_ldap.erl
Simple merge

diff --cc src/ejabberd_auth_odbc.erl
Simple merge

diff --cc src/ejabberd_auth_pam.erl
Simple merge

diff --cc src/ejabberd_c2s.erl
Simple merge

diff --cc src/ejabberd_c2s_config.erl
Simple merge

diff --cc src/ejabberd_captcha.erl
Simple merge

diff --cc src/ejabberd_commands.erl
Simple merge

diff --cc src/ejabberd_config.erl
Simple merge

diff --cc src/ejabberd_ctl.erl
Simple merge

diff --cc src/ejabberd_frontend_socket.erl
Simple merge

diff --cc src/ejabberd_hooks.erl
Simple merge

diff --cc src/ejabberd_http.erl
Simple merge

diff --cc src/ejabberd_http_poll.erl
Simple merge

diff --cc src/ejabberd_listener.erl
Simple merge

diff --cc src/ejabberd_local.erl
Simple merge

diff --cc src/ejabberd_node_groups.erl
Simple merge

diff --cc src/ejabberd_odbc.erl
Simple merge

diff --cc src/ejabberd_odbc_sup.erl
Simple merge

diff --cc src/ejabberd_piefxis.erl
Simple merge

diff --cc src/ejabberd_rdbms.erl
Simple merge

diff --cc src/ejabberd_receiver.erl
Simple merge

diff --cc src/ejabberd_regexp.erl
Simple merge

diff --cc src/ejabberd_router.erl
Simple merge

diff --cc src/ejabberd_s2s.erl
Simple merge

diff --cc src/ejabberd_s2s_in.erl
Simple merge

diff --cc src/ejabberd_s2s_out.erl
Simple merge

diff --cc src/ejabberd_service.erl
Simple merge

diff --cc src/ejabberd_sm.erl
Simple merge

diff --cc src/ejabberd_socket.erl
Simple merge

diff --cc src/ejabberd_sup.erl
Simple merge

diff --cc src/ejabberd_system_monitor.erl
Simple merge

diff --cc src/ejabberd_tmp_sup.erl
Simple merge

diff --cc src/ejabberd_update.erl
Simple merge

diff --cc src/ejabberd_web.erl
Simple merge

diff --cc src/ejabberd_web_admin.erl
Simple merge

diff --cc src/ejd2odbc.erl
Simple merge

diff --cc src/eldap_filter.erl
Simple merge

diff --cc src/eldap_pool.erl
Simple merge

diff --cc src/eldap_utils.erl
Simple merge

diff --cc src/extauth.erl
Simple merge

diff --cc src/gen_iq_handler.erl
Simple merge

diff --cc src/gen_mod.erl
Simple merge

diff --cc src/idna.erl
Simple merge

diff --cc src/jd2ejd.erl
Simple merge

diff --cc src/jlib.erl
Simple merge

diff --cc src/mod_adhoc.erl
Simple merge

diff --cc src/mod_announce.erl
Simple merge

diff --cc src/mod_blocking.erl
Simple merge

diff --cc src/mod_caps.erl
Simple merge

diff --cc src/mod_carboncopy.erl
Simple merge

diff --cc src/mod_configure.erl
Simple merge

diff --cc src/mod_configure2.erl
Simple merge

diff --cc src/mod_disco.erl
Simple merge

diff --cc src/mod_echo.erl
Simple merge

diff --cc src/mod_http_bind.erl
Simple merge

diff --cc src/mod_http_fileserver.erl
Simple merge

diff --cc src/mod_ip_blacklist.erl
Simple merge

diff --cc src/mod_irc.erl
Simple merge

diff --cc src/mod_irc_connection.erl
Simple merge

diff --cc src/mod_last.erl
Simple merge

diff --cc src/mod_muc.erl
Simple merge

diff --cc src/mod_muc_log.erl
Simple merge

diff --cc src/mod_muc_room.erl
Simple merge

diff --cc src/mod_offline.erl
Simple merge

diff --cc src/mod_ping.erl
Simple merge

diff --cc src/mod_pres_counter.erl
Simple merge

diff --cc src/mod_privacy.erl
Simple merge

diff --cc src/mod_private.erl
Simple merge

diff --cc src/mod_proxy65.erl
Simple merge

diff --cc src/mod_proxy65_lib.erl
Simple merge

diff --cc src/mod_proxy65_service.erl
Simple merge

diff --cc src/mod_proxy65_sm.erl
Simple merge

diff --cc src/mod_proxy65_stream.erl
Simple merge

diff --cc src/mod_register.erl
Simple merge

diff --cc src/mod_register_web.erl
Simple merge

diff --cc src/mod_roster.erl
Simple merge

diff --cc src/mod_service_log.erl
Simple merge

diff --cc src/mod_shared_roster.erl
Simple merge

diff --cc src/mod_shared_roster_ldap.erl
Simple merge

diff --cc src/mod_sic.erl
Simple merge

diff --cc src/mod_stats.erl
Simple merge

diff --cc src/mod_time.erl
Simple merge

diff --cc src/mod_vcard.erl
Simple merge

diff --cc src/mod_vcard_ldap.erl
Simple merge

diff --cc src/mod_version.erl
Simple merge

diff --cc src/odbc_queries.erl
Simple merge

diff --cc src/randoms.erl
Simple merge

diff --cc src/scram.erl
Simple merge

diff --cc src/shaper.erl
Simple merge

diff --cc src/str.erl
Simple merge

diff --cc src/translate.erl
Simple merge

diff --cc src/treap.erl
Simple merge

diff --cc src/win32_dns.erl
Simple merge

diff --cc tools/configure.erl
Simple merge

diff --cc tools/p1_prof.erl
Simple merge