tree eec92d5e096ee2a2a5ee2352e1c276382552505b
parent d2559f734bba7fe5257720356a92f3b7a5b0d37c
parent 17367939ebd64f5e6eb4fa5a32ece513f497e6e6
author Junio C Hamano <gitster@pobox.com> 1293573011 -0800
committer Junio C Hamano <gitster@pobox.com> 1293573011 -0800

Merge branch 'maint'

* maint:
  Prepare for 1.7.3.5
  Fix false positives in t3404 due to SHELL=/bin/false
  close file on error in read_mmfile()

Conflicts:
	RelNotes