Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit c16d2c296e84 · 2014-01-24T10:02:17.000-05:00
Conflicts:
	lib/matplotlib/axes/_axes.py
diff --git a/setupext.py b/setupext.py
@@ -10,6 +10,7 @@
 import re
 import subprocess
 import sys
+import warnings
 from textwrap import fill
 
 
