From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Jun 2011 18:40:32 +0000 (-0700)
Subject: Merge branch 'ab/i18n-scripts-basic'
X-Git-Tag: v1.7.6-rc3~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=179aae51bbaa86bd64bbb520f15e6126c92f3f4d;p=git.git

Merge branch 'ab/i18n-scripts-basic'

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

179aae51bbaa86bd64bbb520f15e6126c92f3f4d