Merge branch 'maint'
commit5838dffdcbe92bbbf50a29067fd9dc871155d76d
authorJunio C Hamano <junkio@cox.net>
Sun, 8 Apr 2007 06:34:45 +0000 (7 23:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 8 Apr 2007 06:36:22 +0000 (7 23:36 -0700)
tree68b9605d63f321b5f1ca422afd55803f046563d6
parentee9693e246669f48f6b058a1044cefa973a44c22
parent732bcf942c6e99879349711fd29b5062a704e248
Merge branch 'maint'

* maint:
  Prepare for 1.5.1.1
  cvsserver: small corrections to asciidoc documentation