Merge branch 'jc/merge-blobs'
commit9591fcc6d66fd213c8c9f73553b7684b73daf4cb
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 18:48:20 +0000 (22 10:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 18:48:20 +0000 (22 10:48 -0800)
tree8dd432bdf7821f0a86349628f148fed232acc995
parentc4ada6283eaf1d4970b92b0e2cb9503a17da27ad
parenta60521bc6099ce89d05ef2160d2e3c30a106fda7
Merge branch 'jc/merge-blobs'

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