Merge branch 'maint'
commit66c349027b18d36d13c5a0d798e51aa183d7eacd
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:38:20 +0000 (14 21:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:38:20 +0000 (14 21:38 -0700)
treede9520eae737029542833293fd3ca00259e013f7
parent1084f3b844d80d84d2d318bc562b78514cd78028
parentd4d39bc32db51928b190c3128ced6194b81b3a99
Merge branch 'maint'