Merge branch 'jn/maint-notes-avoid-va-args' into maint

* jn/maint-notes-avoid-va-args: notes merge: eliminate OUTPUT macro Conflicts: notes-merge.c

Junio C Hamano committed Nov 18, 2011 at 11:11 UTC 01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64

No changes.