Merge branch 'nm/maint-conflicted-submodule-entries' into maint
* nm/maint-conflicted-submodule-entries: submodule: process conflicting submodules only once
Junio C Hamano committed
Apr 6, 2011 at 10:41 UTC
0c41f33c19c2f40015e31211557e818b000f9a25
No changes.