John MacFarlane 616cf6c539 Merge branch 'dokuwiki' of https://github.com/claremacrae/pandoc into claremacrae-dokuwiki		2014-07-07 16:15:35 -06:00
..
Pandoc	Merge branch 'dokuwiki' of https://github.com/claremacrae/pandoc into claremacrae-dokuwiki	2014-07-07 16:15:35 -06:00
Pandoc.hs	Merge remote-tracking branch 'jgm/master' into dokuwiki	2014-06-29 19:22:31 +01:00