tree 8858983d81b0eef76eb55d21a0d96b7b16846eca
parent 6674d310d179400358d581f9725cbd4a2c32e3bf
parent 9a217391e931763d168d177decfe5e962d306bac
author Junio C Hamano <gitster@pobox.com> 1253137518 -0700
committer Junio C Hamano <gitster@pobox.com> 1253137518 -0700

Merge branch 'jc/maint-unpack-objects-strict' into maint

* jc/maint-unpack-objects-strict:
  Fix "unpack-objects --strict"

Conflicts:
	builtin-unpack-objects.c