Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

* mh/maint-notes-merge-pathbuf-fix: notes_merge_commit(): do not pass temporary buffer to other function

Junio C Hamano committed Oct 26, 2011 at 16:12 UTC 8280baf565e1c72adaa6d2dfef70d18837126898

No changes.