Merge branch 'stable'

sphinx-doc · May 18, 2015 · 2710d8e · 2710d8e
2 parents c25eb6e + 4dc132f
commit 2710d8e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sphinx/application.py b/sphinx/application.py
@@ -446,6 +446,9 @@ def setup_extension(self, extension):
                     'version.' % (extension, err))
         if ext_meta is None:
             ext_meta = {}
+            # special-case for compatibility
+            if extension == 'rst2pdf.pdfbuilder':
+                ext_meta = {'parallel_read_safe': True}
         try:
             if not ext_meta.get('version'):
                 ext_meta['version'] = 'unknown version'