![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 23:04:16 +0000 (15:04 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 23:04:16 +0000 (15:04 -0800) | ||
| commit | 86e5b51fac729d2aa9ce1a9e8f945653d215cf74 | |
| tree | eb6455c69e2bb2fc93d505c18ba7b4de88df9289 | tree | snapshot |
| parent | 4a295c76d329d1483519e30678d4805636170b70 | commit | diff |
| parent | 03276d94bcdb7d463a029936933898948c0669ac | commit | diff |
Merge branch 'master' into next
* master:
* master: