MAINT: manually merge the ipython directive change

alexbrc · alexbrc · commit ee72affb5a4e · 2014-12-08T14:00:57.000-05:00
diff --git a/conf.py b/conf.py
@@ -26,7 +26,7 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['matplotlib.sphinxext.only_directives',
               'matplotlib.sphinxext.plot_directive',
-              'matplotlib.sphinxext.ipython_directive',
+              'IPython.sphinxext.ipython_directive',
               'sphinx.ext.mathjax',
               'sphinx.ext.autodoc',
               'sphinx.ext.doctest',
