diff -r b6e443be2a9b -r cacd524f5279 src/cm/converters/pandoc_converters.py
--- a/src/cm/converters/pandoc_converters.py	Thu May 24 12:48:39 2012 +0200
+++ b/src/cm/converters/pandoc_converters.py	Thu May 24 14:42:22 2012 +0200
@@ -38,7 +38,7 @@
 
 # pandoc capabilities
 INPUT_FORMATS = ['native', 'markdown', 'rst', 'html', 'latex']
-OUTPUT_FORMATS = ['native', 'html', 's5', 'docbook', 'opendocument', 'odt', 'latex', 'context', 'texinfo', 'man', 'markdown', 'rst', 'mediawiki', 'rtf', 'pdf']
+OUTPUT_FORMATS = ['native', 'html', 's5', 'docbook', 'opendocument', 'odt', 'latex', 'context', 'texinfo', 'man', 'markdown', 'rst', 'mediawiki', 'rtf', 'pdf', 'epub']
 
 # input formats
 CHOICES_INPUT_FORMATS = [(f, f) for f in ['markdown', 'rst', 'html']]