![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Dec 2010 19:26:21 +0000 (11:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Dec 2010 19:26:21 +0000 (11:26 -0800) | ||
| commit | 94debb8374c6d956221ceb71492d175e5c8fa3f3 | |
| tree | 151a8fb4ab7c088abeb32126592d09a8416ad508 | tree | snapshot |
| parent | 815bed26271cb19020bd66e5ecbbc79960f794bb | commit | diff |
| parent | f80b6de4eca9c4c4abfe9407736311de27726e53 | commit | diff |
Merge branch 'master' into next
* master:
* master: