![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Mar 2009 04:45:02 +0000 (21:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Mar 2009 04:45:02 +0000 (21:45 -0700) | ||
| commit | 54e7e7891b75741ba745e783dd5c5f488f377438 | |
| tree | 61a78c7f536a73b6cfaafee7595fc35680a9826e | tree | snapshot |
| parent | daf713dd497ef04855ccecf90ad9aafb17769681 | commit | diff |
| parent | 94c88edef7a69299e12248b910752f1fc26f12d6 | commit | diff |
Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1
* js/maint-1.6.1-rebase-i-submodule:
Fix submodule squashing into unrelated commit
rebase -i squashes submodule changes into unrelated commit
* js/maint-1.6.1-rebase-i-submodule:
Fix submodule squashing into unrelated commit
rebase -i squashes submodule changes into unrelated commit