Merge branch 'es/utf8-stupid-compiler-workaround' into maint
commit71a8af60aeed0ae67d119eb5e0f7d3ce1b15b2b7
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 18:41:23 +0000 (15 11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 18:41:23 +0000 (15 11:41 -0700)
tree9d94fd70b0b0b042b30845068cfb8df441bfdc6e
parenta15ebbc2c7181ad6574726ebf9549e99ee293c74
parente654eb29ab9da97f6acabc261f88aa1f41f78a8f
Merge branch 'es/utf8-stupid-compiler-workaround' into maint

A compilation workaround.

* es/utf8-stupid-compiler-workaround:
  utf8: NO_ICONV: silence uninitialized variable warning
utf8.h