Merge branch 'ab/i18n-scripts-basic'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2011 18:40:32 +0000 (11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2011 18:40:32 +0000 (11:40 -0700)
* ab/i18n-scripts-basic:
  sh-i18n--envsubst.c: do not #include getopt.h

1  2 
sh-i18n--envsubst.c

Simple merge