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

mdboom · mdboom · commit 7565d0756d7e · 2013-08-26T12:52:34.000-04:00
Conflicts:
	lib/matplotlib/axes.py
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -4839,7 +4839,7 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
             the y coordinate(s) of the bars
 
         color : scalar or array-like, optional
-            the colors of the bars
+            the colors of the bar faces
 
         edgecolor : scalar or array-like, optional
             the colors of the bar edges
