Merge branch 'ab/i18n-scripts-basic'
commit179aae51bbaa86bd64bbb520f15e6126c92f3f4d
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2011 18:40:32 +0000 (17 11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2011 18:40:32 +0000 (17 11:40 -0700)
treebb01ae4a7f76683117459b5ea6dbf9b052c1e909
parent302bd999fd0ef41f3605a2212c23f54ae43649f8
parent7c1fdd7019ea03438744849b9532cf768ba1247c
Merge branch 'ab/i18n-scripts-basic'

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