Merge branch 'jk/maint-strbuf-missing-init'

* jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf Conflicts: builtin/merge.c

Junio C Hamano committed Dec 22, 2011 at 11:27 UTC 1aea303d7eafc5f178b253f4d069eb5f2acfb409

No changes.