Merge branch 'master' into next
commitb33e72f922cb68099d93a91f08d6cf098d2f761f
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:52 +0000 (20 15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:52 +0000 (20 15:54 -0700)
tree9ee914e5a87e4559df2feee18e9f1f0bcd8f9c72
parent898d27118349f1a83f6d93545cb67dbcb0b8c288
parent498a04af143f55a7bbbba484d48a7f123d43be04
Merge branch 'master' into next

* master: