Merge branch 'hv/config-from-blob' into maint

Compilation fix on platforms with fgetc() and friends defined as macros. * hv/config-from-blob: config: do not use C function names as struct members

Junio C Hamano committed Sep 5, 2013 at 14:40 UTC bda790474690a5e5e9963221dc0d5b66fbf01875

No changes.