Merge branch 'uk/maint-shortlog-encoding'
commita689faeb5850174edfbbb0a502ef7eee8cd06d76
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:42:28 +0000 (30 14:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:42:28 +0000 (30 14:42 -0800)
treec1ce351a69efce2b7c0a7a2773ffd934a9888e6f
parent1bab4bba5457bd55fc1c27ddc4218b4b375c8251
parent79f7ca063d6b74e9d7f3db90c85dfa4a162128e4
Merge branch 'uk/maint-shortlog-encoding'

Conflicts:
builtin-shortlog.c
builtin-shortlog.c