Merge branch 'master' into next
commite3bbf45de3ccc696ed89527339717ab89914dbb4
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 02:46:39 +0000 (5 19:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 02:46:39 +0000 (5 19:46 -0700)
treef05ffc99641fcdf1fdd877c6ca453a3069163bfd
parent0e64aac1272c66103a0d3982fca12791fd8fa9e7
parent8b5fe8c9ec3f961ec9b09844eca6225f06af5b0b
Merge branch 'master' into next

* master:
  Revert "Link against libiconv on IRIX"
Makefile