John MacFarlane c989bf028f Merge branch 'textile' ... Conflicts: README man/man1/pandoc.1.md pandoc.cabal		2010-11-27 10:52:44 -08:00
..
markdown2pdf.1.md	Updated markdown2pdf man page.	2010-02-03 05:52:26 +00:00
pandoc.1.md	Merge branch 'textile'	2010-11-27 10:52:44 -08:00