Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 08:38:39 +0000 (01:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 08:38:39 +0000 (01:38 -0700)
commitc379c4b176ce350a8d6c0773a3ad211996d809db
treece25ea6585b62efe698dd14f65459215630da120
parent36db2399e023c1526fac0b142524229554b88419
parentad0f8c9ea76dcce82eb3fa1b308e495c21b834d1
Merge branch 'maint'

* maint:
  cvsserver: asciidoc formatting changes