Merge branch 'ml/mailmap' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000 (11:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000 (11:14 -0800)
commit79cfe0c...c4920bf68da548ad0d5bcdb425ce8d5f
tree9ae710c...2bcb33eca92ebcb1fff61b98d4e08194copy hash to clipboard (tree)
parent01e0f16...a70f61de0b7aa0e9d8c49c03cbafeb64copy hash to clipboard (diff)
parent74b531f...5feaa09b5c3963f788b437a368933730copy hash to clipboard (diff)
mailmap.c