Merge branch 'jn/maint-notes-avoid-va-args' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:11:50 +0000 (11:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:11:50 +0000 (11:11 -0800)
commit01e0f16...a70f61de0b7aa0e9d8c49c03cbafeb64
tree6d7a2ad...16b12ad674c1e146d854dce56c99076dcopy hash to clipboard (tree)
parent487da9c...f4fc4e3735cede5a31c2ac7be18b50b2copy hash to clipboard (diff)
parent5f9f8d1...f176a02cc66531cf5b5f749bec068961copy hash to clipboard (diff)
notes-merge.c