Merge branch 'tz/fsf-address-update'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:33 +0000 (12:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:34 +0000 (12:14 +0900)
* tz/fsf-address-update:
Replace Free Software Foundation address in license notices
Replace Free Software Foundation address in license notices

1  2 
contrib/completion/git-completion.bash
contrib/credential/libsecret/git-credential-libsecret.c
imap-send.c
Simple merge
Simple merge
diff --cc imap-send.c
Simple merge