Merge branch 'maint'
commitf5a92647694f18fb3544060a1a964ac082d072b2
authorJunio C Hamano <junkio@cox.net>
Mon, 19 Feb 2007 02:45:52 +0000 (18 18:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 19 Feb 2007 02:45:52 +0000 (18 18:45 -0800)
tree72bb1ee2f6c62554b8718b34273591cd9827cd15
parentb758120144f8850bb2db2f233e2c828be4ba4958
parent4bc94d289221e16cccbc72f73b3b5b1de0b822c5
Merge branch 'maint'

* maint:
  GIT 1.5.0.1
  Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
  Read the config in rev-list

Conflicts:

RelNotes