Merge branch 'mv/maint-merge-fix' into maint
* mv/maint-merge-fix: merge: fix numerus bugs around "trivial merge" area
Junio C Hamano committed
Aug 24, 2008 at 14:29 UTC
97e5f4908dd22c99e825ccb254f05a61fda8d19c
No changes.