![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Dec 2010 22:41:43 +0000 (14:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Dec 2010 22:41:43 +0000 (14:41 -0800) | ||
| commit | 38bda96a397db648fdb27619cac1db4c7719d62e | |
| tree | a687a7d7430dc96e6cb860628305dc3b2ca6d66c | tree | snapshot |
| parent | 8883a0cd5dc07da65afadda4c449e5c028ed63f7 | commit | diff |
| parent | 48e0ad033ffd009df1283858ac70ac53660e2d7c | commit | diff |
Merge branch 'master' into next
* master:
* master: