Merge branch 'maint'
authorJunio C Hamano <redacted>
Mon, 19 Jul 2010 18:21:08 +0000 (11:21 -0700)
committerJunio C Hamano <redacted>
Mon, 19 Jul 2010 18:21:08 +0000 (11:21 -0700)
* maint:
  update-server-info: Shorten read_pack_info_file()
  Documentation: Explain git-mergetool's use of temporary files


Trivial merge
git clone https://git.99rst.org/PROJECT