John MacFarlane 357b965b44 Merge branch 'citeproc' into master. ... Conflicts: src/Text/Pandoc/Definition.hs		2010-12-03 23:43:47 -08:00
..
Text	Merge branch 'citeproc' into master.	2010-12-03 23:43:47 -08:00
markdown2pdf.hs	Added --data-dir to valid options for markdown2pdf.	2010-12-02 22:42:13 -08:00
pandoc.hs	Merge branch 'citeproc' into master.	2010-12-03 23:43:47 -08:00