![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Dec 2010 05:50:52 +0000 (21:50 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Dec 2010 05:50:52 +0000 (21:50 -0800) | ||
| commit | a2ccc1021be2cd130c7900ac27dd4a60ec85985c | |
| tree | 1ca05fece4746261255c2baad4afae5ec2c71195 | tree | snapshot |
| parent | 018bc80d140aff02f61e3a5100dd1367311d38ff | commit | diff |
| parent | b5c178143088350c49129acbedb864d70c666215 | commit | diff |
Merge branch 'master' into next
* master:
* master: