Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend

Conflicts:
	pandoc.cabal

1 files changed, 1 insertions, 0 deletions

diff --git a/pandoc.hs b/pandoc.hs
index 48f4dee55..23c22df65 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -896,6 +896,7 @@ defaultReaderName fallback (x:xs) =
     ".json"     -> "json"
     ".docx"     -> "docx"
     ".t2t"      -> "t2t"
+    ".epub"     -> "epub"
     _           -> defaultReaderName fallback xs
 
 -- Returns True if extension of first source is .lhs