web commit by joey: conflict and merge is done!
[ikiwiki] / mdwn2man
2006-03-15  joeyman page generation