From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Dec 2007 09:22:42 +0000 (-0800)
Subject: Merge branch 'master' into cc/help
X-Git-Tag: v1.5.4-rc0~1^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7be2b6e02b4f2a1b4812764f65b12cafb11a934e?hp=7be2b6e02b4f2a1b4812764f65b12cafb11a934e

Merge branch 'master' into cc/help

This is to primarily pull in MANPATH tweak and help.txt formatting fix
from the master branch.
---