Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:29:08 +0000 (27 13:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:29:08 +0000 (27 13:29 -0800)

Trivial merge