Merge branch 'mr/mark-i18n-log-rerere'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:40 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:41 +0000 (11:38 -0700)
commit49fb13bef188fdba6fc4eb2266f79808168e4ebe
treeb273c9b3fd8fd80a61c7b24aa4738121878ac004
parent19f8c8b2dae7d959e67b85db77eaaa396906f92c
parente4a590efa2d49e6eb4dccfa41a477703493417f3
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
builtin/log.c