Merge branch 'dm/configure-iconv-locale-charset'
commit2f2db83fb77e8c639f8b8ebeab97d92c492d721c
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:07:51 +0000 (25 11:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:07:51 +0000 (25 11:07 -0700)
tree19cec52dc38fcf4f08932c38f89ef45b396edb07
parent46c0f913a49218a8a94d30c5a2df792a16aab827
parent62fb6d03dab0f6d93b1e1fcaef312bf6e2718f17
Merge branch 'dm/configure-iconv-locale-charset'

* dm/configure-iconv-locale-charset:
  configure.ac: link with -liconv for locale_charset()
configure.ac