Merge branch 'master' into next
commitcfd4979c8f619202e04abe06b9cd742131d3422b
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 23:24:41 +0000 (3 16:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 23:24:41 +0000 (3 16:24 -0700)
treef91245217afe16fd4ae61b1575a5dc68bcfe959f
parentd550ecdc42bd9a5e364767da2177640724535e93
parent3fc0e4ca00330ce1dfd92baeda04f0aa2fbd7e68
Merge branch 'master' into next