Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 22:07:46 +0000 (14:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 22:07:46 +0000 (14:07 -0800)
commit1a56be134f9477296a7ade040e8b802bf3a643a1
treed6a7d5fb7dec7d318cdf9cef2f06040fd7fdcc16
parenteff726f0c28097e7964eb876d005e50e0dcdb9a0
parentadf9628ea41bd226dc5ab38daa0bc661097a2127
Merge branch 'maint'

* maint:
  Prepare for 1.6.5.5
  Documentation: xmlto 0.0.18 does not know --stringparam
  t4201: use ISO8859-1 rather than ISO-8859-1
Documentation/Makefile