pandoc/src/Text
John MacFarlane a6dcae1648 Merge commit 'd25656571a4662a4e67b195daed69e77d80c4c2c'
Conflicts:
	src/Text/Pandoc/Writers/ODT.hs
2012-08-23 19:39:58 -07:00
..
Pandoc Merge commit 'd25656571a4662a4e67b195daed69e77d80c4c2c' 2012-08-23 19:39:58 -07:00
Pandoc.hs Changed strict to markdown_strict. 2012-08-09 22:32:22 -07:00