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

Junio C Hamano committed Sep 19, 2014 at 11:38 UTC 49fb13bef188fdba6fc4eb2266f79808168e4ebe

No changes.