Merge branch 'tz/fsf-address-update' into maint

Replace the mailing address of FSF to a URL, as FSF prefers.

* tz/fsf-address-update:
Replace Free Software Foundation address in license notices
Replace Free Software Foundation address in license notices

diff --combined contrib/completion/git-completion.bash
index 539d7f84f3d84adb6d3cbb3301dcbb749033b610,6934064ee9376f30a3a7b7ae6ac324d354ea8899..a54cc2cef6b8a773863da41b01bc1aaa2ae1f0ce
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -111,8 -111,7 +111,7 @@@ __git (
  #   GNU General Public License for more details.
  #
  #   You should have received a copy of the GNU General Public License
- #   along with this program; if not, write to the Free Software Foundation,
- #   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #   along with this program; if not, see <http://www.gnu.org/licenses/>.
  #
  #   The latest version of this software can be obtained here:
  #
@@@ -1250,8 -1249,7 +1249,8 @@@ _git_checkout (
        --*)
                __gitcomp "
                        --quiet --ours --theirs --track --no-track --merge
 -                      --conflict= --orphan --patch
 +                      --conflict= --orphan --patch --detach --ignore-skip-worktree-bits
 +                      --recurse-submodules --no-recurse-submodules
                        "
                ;;
        *)

diff --combined contrib/credential/libsecret/git-credential-libsecret.c
index b4750c9ee89d29e16102a0fa0134c2b6cfe74cd0,cfe295f36bb0b1bc8dcf5a97cf18c9682d0f3b5f..e6598b63833963115d43c62d9dd794bc03e120f1
--- 1/contrib/credential/libsecret/git-credential-libsecret.c
--- 2/contrib/credential/libsecret/git-credential-libsecret.c
+++ b/contrib/credential/libsecret/git-credential-libsecret.c
@@@ -14,8 -14,7 +14,7 @@@
   *  GNU General Public License for more details.
   *
   *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
   */
  
  /*
@@@ -104,7 -103,7 +103,7 @@@ static int keyring_get(struct credentia
        items = secret_service_search_sync(service,
                                           SECRET_SCHEMA_COMPAT_NETWORK,
                                           attributes,
 -                                         SECRET_SEARCH_LOAD_SECRETS,
 +                                         SECRET_SEARCH_LOAD_SECRETS | SECRET_SEARCH_UNLOCK,
                                           NULL,
                                           &error);
        g_hash_table_unref(attributes);