Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:33:27 +0000 (11 18:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:33:27 +0000 (11 18:33 -0800)

Trivial merge