From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Feb 2010 18:38:42 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~145
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1958e5be90be7bba3037b8a7853f0fb64f24fc09;p=git-core%2Fgit.git

Merge branch 'maint'

* maint:
  git-p4: fix bug in symlink handling
  t1450: fix testcases that were wrongly expecting failure
  Documentation: Fix indentation problem in git-commit(1)
---

1958e5be90be7bba3037b8a7853f0fb64f24fc09