Merge branch 'jk/fix-attribute-macro-in-2.5'
commit643318913fc791790eb30a78531f7ae4eed7155d
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:15 +0000 (3 14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:15 +0000 (3 14:08 -0700)
tree6c0f1986b04caa06f04c66ae33b348be27b90ac7
parent3944f903eb8eba3fe86f5b95acdb9af7a0f0438e
parent060e7766ba34dc4fef351494239235ba365edd18
Merge branch 'jk/fix-attribute-macro-in-2.5'

Code fixup.

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