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

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

1  2 
utf8.h
diff --cc utf8.h
Simple merge