Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:12 +0000 (14:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:12 +0000 (14:40 -0700)
Code fixup.

* jk/fix-attribute-macro-in-2.5:
remote.c: spell __attribute__ correctly

1  2 
remote.c
diff --cc remote.c
Simple merge