Merge branch 'sb/maint-octopus' into maint-1.6.5
* sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow
Junio C Hamano committed
Feb 1, 2010 at 00:06 UTC
153559a964f436aeb909e3b7e86ceaa998aeed68
No changes.