Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 21:57:47 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 21:57:47 +0000 (14:57 -0700)
commitfe77d18a3fdef1f112d67d78d5dc6745cf2e3a8d
treea22c3f4ada4110f0141a68c723f6fe1a713cdeb9
parent2a34220e429d2bdb995fc7263c897b72613625c9
parente7a85be3cfc4ee017f59f1d1f8ceb63d7c88c9c8
Merge branch 'master' into next

* master: