Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:28 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:28 +0000 (15:54 -0700)
commit498a04af143f55a7bbbba484d48a7f123d43be04
tree295f5f7c2479d75c0f0565c24fb0872c491289f4
parentf524129737d9ba3e685c31bacde844ec1db1fea9
parent0f360763c02d1230614e23f94fb298dab0162aa0
Merge branch 'maint'

* maint: