Fix compilation on Solaris
Fix bugs related to bottom kwarg in step histograms

Conflicts:

	lib/matplotlib/axes.py
	lib/matplotlib/tests/baseline_images/test_axes/hist_step.png
Merge pull request #2198 from dmcdougall/fix_solaris_compile

Fix compilation on Solaris
Merge remote-tracking branch 'upstream/v1.2.x' into v1.3.x
Merge pull request #2550 from joferkington/fix-wx-singleshot-timer

Using a single-shot timer with the Wx backend raises an AttributeError
AffineBase.__eq__ should not raise an exception when the other does not have "is_affine" attribute.
Merge pull request #2581 from leejjoon/affine_base_eq

AffineBase.__eq__ should not raise an exception when the other does not ...
Merge pull request #2584 from magnunor/fix_legend_typo

Fix typo in legend documentation
Merge pull request #2591 from dopplershift/fix-infinite-recursion

Fix infinite recursion in units with ndarray subclasses.
add __eq__ to `matplotlib.gridspec.SubplotSpec`

This is to address the issue discovered in
http://stackoverflow.com/questions/20017314/how-are-existing-subplot-axes-retrieved-using-subplot2grid-gridspec-in-matplotli
where multiple calls to

   gs = gridspec.GridSpec(2, 1)
   ax1 = fig.add_subplot(gs[0, 0])
   ax2 = fig.add_subplot(gs[0, 0])

will return a new axes each time (unlike calls integers or tuples).
Added check to __eq__ to short-circuit out if the other object
does not have the necessary attributes.
added __hash__ so that data model will be happy again
Merge pull request #2409 from neggert/hist_bottom_fix2

Fix bugs related to bottom kwarg in step histograms
BLD Fix build failure on Python 3.4b1 for Windows Windows

As of version 3.4b1 the official CPython distribution for Windows uses Tcl/Tk 8.6.
Merge pull request #2613 from cgohlke/patch-1

BLD Fix build failure on Python 3.4b1 for Windows
added failing test
slight tweak to example, as discussed in #1451 to change `plt.draw()`
-> `plt.pause(.001)` to fake animations.
BUG: correctly convert labelsize -> int

Do this by getting the size value back from the underlying text
object.
Merge pull request #2619 from tacaswell/issue_1451

slight tweak to mpl_example
Merge pull request #2618 from tacaswell/fix_issue_1172

Fix issue 1172