![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 05:03:44 +0000 (22:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 05:03:44 +0000 (22:03 -0700) | ||
| commit | 2d0e57103f0af55abbbd7c61b29650463c3887cc | |
| tree | b90ff88054c71e73007d556dd150a66d333c3613 | tree | snapshot |
| parent | 5847c404d38e44628f74d476ed9c04be35ece082 | commit | diff |
| parent | 7ebee44167fc25b975f5543472c851ab1840af1b | commit | diff |
Merge branch 'master' into next
* master:
* master: