Merge branch 'master' into next
commit6ddb849836fa53f9ed36fe74e7f1caf18e635160
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:39:25 +0000 (7 11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:39:25 +0000 (7 11:39 -0700)
treecec944ed84508067aaa4588755b4c70e5c4326c9
parente7e352704aaf0334bc92779b46582b79848bca8e
parent0ce986446163b37c7f663ce7a408e7f94c31ba63
Merge branch 'master' into next