Merge branch 'master' into next
commitae1582f6c8d0a2f75d9c9659d8c08ebfd744ce93
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Nov 2011 00:49:00 +0000 (7 16:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Nov 2011 00:49:00 +0000 (7 16:49 -0800)
treea93add875825c2dec1cd6d2716f3473e32ad90d0
parent017606dc5058aad383a1e24663ae1d0ae8d0edd3
parent4cb6764227173a6483edbdad09121651bc0b01c3
Merge branch 'master' into next

* master:
  Git 1.7.8-rc1
  blame.c: Properly initialize strbuf after calling textconv_object(), again