Merge branch 'maint'
commit7a6a5e406297792075ca20a63427dd37ee4ecb01
authorJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 23:51:05 +0000 (20 16:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 23:51:05 +0000 (20 16:51 -0700)
treea00ae9e8db4de87e652ebb9c11a7970dd687af40
parente19343ad547e32aaf511b0b38be083e1b3145d4e
parent0b92f1a9d213644d2cd6c1870091c090a6b7eca9
Merge branch 'maint'

* maint:
  Fix typo in show-index.c
  pager: default to LESS=FRS