Merge branch 'maint'

* maint: add, merge, diff: do not use strcasecmp to compare config variable names

Junio C Hamano committed May 14, 2011 at 20:44 UTC 2f80de956f71880b000933b1b9bff4991c5b3ca9

No changes.