Merge branch 'dp/i18n-libcharset' into next
commit528de77ae38143ee6f3d38df17094b84952fa823
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:53:24 +0000 (13 11:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:53:24 +0000 (13 11:53 -0800)
treec8523103550877ed47fdfa33ba3db4ed85493f8b
parent35366b85cb73a6ebce6fe2ef519d54bbde78973f
parentb5225286b226759262c0637058528af03226fba6
Merge branch 'dp/i18n-libcharset' into next

* dp/i18n-libcharset:
  Makefile: introduce CHARSET_LIB to link with -lcharset
Makefile