From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Apr 2014 17:42:52 +0000 (-0700)
Subject: Merge branch 'jx/i18n'
X-Git-Tag: v2.0.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fe3ee67adcd2ee9372c7044fa311ce55eb285b4;p=thirdparty%2Fgit.git

Merge branch 'jx/i18n'

* jx/i18n:
  i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines
  i18n: only extract comments marked with "TRANSLATORS:"
  i18n: remove obsolete comments for translators in diffstat generation
  i18n: fix uncatchable comments for translators in date.c
---

8fe3ee67adcd2ee9372c7044fa311ce55eb285b4