Merge branch 'ab/i18n-scripts-basic'

* ab/i18n-scripts-basic: sh-i18n--envsubst.c: do not #include getopt.h

Junio C Hamano committed Jun 17, 2011 at 11:40 UTC 179aae51bbaa86bd64bbb520f15e6126c92f3f4d

No changes.