Merge branch 'nd/i18n-apply-lego' into next
commitc2be9041c0d449955262c69ad77e48b1034d1e93
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2012 18:39:18 +0000 (8 11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2012 18:39:18 +0000 (8 11:39 -0700)
tree5cc6dcd90a83d53bae4a03c32973de5c1ea7ed63
parent053b79703747c47ec85023af47deaf9dc429883b
parent4c5197d10f01f1dce817af05fd0837bce84708b7
Merge branch 'nd/i18n-apply-lego' into next

By Nguyễn Thái Ngọc Duy
* nd/i18n-apply-lego:
  apply: remove lego in i18n string in gitdiff_verify_name