Merge branch 'jk/1.7.0-status' (early part) into jch
commitae7b6b6004888c06c220cc08502dbeefc65b0b53
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 08:29:52 +0000 (4 01:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2009 08:29:52 +0000 (4 01:29 -0700)
treeddd8a9461b8f8f3e9f9cd4035a72e644541f9681
parentcdd925bfed023d5c3fd7b025a08682811bebcf6f
parent7c9f7038e923e6eb135b27c6fca9a010b034bc27
Merge branch 'jk/1.7.0-status' (early part) into jch

Conflicts:
Documentation/git-commit.txt
Documentation/git-commit.txt