Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Feb 2010 18:38:42 +0000 (10:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Feb 2010 18:38:42 +0000 (10:38 -0800)
commit1958e5be90be7bba3037b8a7853f0fb64f24fc09
treef75e5739c7e43bb1f3b790afdb3dc425f28f268b
parent50c19c777d7b219914b4149e9a465542e3cb5700
parentb39c3612eb443e77bd04d645578e1155988c6dde
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)