From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2009 22:07:46 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1a56be134f9477296a7ade040e8b802bf3a643a1;p=git.git

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
---

1a56be134f9477296a7ade040e8b802bf3a643a1