Merge branch 'master' into next
commit6ba2fd09ea5c16dc67d4dcfacd08418cb3c1a06f
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:53:54 +0000 (28 14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:53:54 +0000 (28 14:53 -0700)
treea8bd8b975b72c0b56855882325090b23f3668f3f
parent02f2eacb8de7c4cc9dd0f33a2e80cf008550a1a9
parent50d3062ab2cea4e999b8f3bafd211ff348bca600
Merge branch 'master' into next

* master: