Merge branch 'km/log-usage-string-i18n'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:32:39 +0000 (12:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:32:39 +0000 (12:32 -0800)
* km/log-usage-string-i18n:
log.c: fix translation markings

1  2 
builtin/log.c
diff --cc builtin/log.c
Simple merge