Merge branch 'maint-1.6.0' into maint
commit919ab6429aab9af44feea0768feef80f3092e9d3
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:38:58 +0000 (5 19:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:38:58 +0000 (5 19:38 -0800)
tree34a6e799b49b5c4b3f3f00a3e86148e8af203c72
parentc7893501e879ebb541a55e5633f7e0f1729407cb
parentab2fdb3b62589477bde0cd0af8239bee510c3488
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Fixed broken git help -w when installing from RPM
git.spec.in