Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Feb 2010 21:25:06 +0000 (13:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Feb 2010 21:25:06 +0000 (13:25 -0800)
commit9bbcf8b2113e775706086d8dbf45896f578a31f8
tree189d113ebaae1f15cfd4dde557c9e304245949a4
parentc9a6c2f95e83ad971842bfbc119c614571809cfa
parent241b9254e1c8ff071d8054f8b6fbe1883b389d69
Merge branch 'master' into next

* master: