Merge branch 'nm/maint-conflicted-submodule-entries'
* nm/maint-conflicted-submodule-entries: submodule: process conflicting submodules only once
Junio C Hamano committed
Apr 4, 2011 at 03:41 UTC
1eb71bc0ec609c67b8a308f9267691144a48bffd
No changes.