Merge branch 'jc/merge-blobs'

* jc/merge-blobs: Makefile: Replace merge-file.h with merge-blobs.h in LIB_H

Junio C Hamano committed Jan 22, 2013 at 10:48 UTC 9591fcc6d66fd213c8c9f73553b7684b73daf4cb

No changes.