Merge branch 'hv/config-from-blob'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:06:52 +0000 (10:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:06:52 +0000 (10:06 -0700)
Portability fix.

* hv/config-from-blob:
config: do not use C function names as struct members

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