Merge branch 'maint'
commit77097faa5dc3da2947f4a4bdb6f8a7766f4ef89a
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:41:42 +0000 (15 16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:41:42 +0000 (15 16:41 -0800)
tree7c393d9bea4c6983240dbc87d5aa4a36c9046f06
parent2dfb96c9fc925ce2f9cd6bd347bc15c1edc368fe
parentdd2195eb80ee5753e41d9688ddf6758a142a14df
Merge branch 'maint'

* maint: