Merge branch 'dp/i18n-libcharset' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 22:57:14 +0000 (14:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 22:57:14 +0000 (14:57 -0800)
commitef55bd78e7a524e8fd7513ffa5fb6253667369cf
treeae83bb99ae90d9ed0c014b512ab98469392e4d4c
parent6f61eb201799ee83c3a82f1f097c18b3854c0c03
parentb5225286b226759262c0637058528af03226fba6
Merge branch 'dp/i18n-libcharset' into maint

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