![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 18 Nov 2005 23:54:23 +0000 (15:54 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 18 Nov 2005 23:54:23 +0000 (15:54 -0800) | ||
| commit | 0b4276931f4130e93f393cb8b9fa0ce2138f1d9c | |
| tree | e887f3157fe315a40714bc76877a71a39824176a | tree | snapshot |
| parent | f9039f30d56e3815eaab870d8b19c7b94aded8aa | commit | diff |
| parent | eb777612f085fc42afd0ac6986ed8062f8b75cbd | commit | diff |
| parent | 7f59dbbb8f8d479c1d31453eac06ec765436a780 | commit | diff |
Merge branches 'jc/branch' and 'jc/rebase'