Merge branch 'master' into next
commit1874b78833c3e8f722047f4fdbc9010be37d7e4f
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 05:23:46 +0000 (6 21:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 05:23:46 +0000 (6 21:23 -0800)
treea471a1db375e13d2cf0d6067bebd2ca3fea7d2c0
parenta49516f7bc4c2895be5b0abffee87963c65486fa
parent5ae0f68160a189fafc2cf50b9a35aacc73cf8209
Merge branch 'master' into next

* master: