Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:27:27 +0000 (17:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:27:27 +0000 (17:27 -0800)

Trivial merge