From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 18:38:40 +0000 (-0700)
Subject: Merge branch 'mr/mark-i18n-log-rerere'
X-Git-Tag: v2.2.0-rc0~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49fb13bef188fdba6fc4eb2266f79808168e4ebe;p=git

Merge branch 'mr/mark-i18n-log-rerere'

* mr/mark-i18n-log-rerere:
  builtin/log.c: mark strings for translation
  rerere.h: mark string for translation
---

49fb13bef188fdba6fc4eb2266f79808168e4ebe