backend_pgf: fix parsing of CR+LF newlines
Merge pull request #1233 from cgohlke/patch-1

Fix mri_demo.py fails with mpl 1.2.0rc1
Fix mri_demo.py fails with mpl 1.2.0rc1
Merge pull request #1241 from pwuertz/pgf-fix-splitlines

backend_pgf: fix parsing of CR+LF newlines
Merge pull request #1224 from WeatherGod/imshow_alpha

Imsave alpha
Doc tidy up.
Merge pull request #1242 from pelson/doc_stuff

Doc tidy up.
Fix some broken links in the docs
Merge remote-tracking branch 'upstream/v1.2.x'
Merge pull request #1243 from mdboom/issue1243

Fixed broken doc links
Merge pull request #1152 from ChrisBeaumont/checkable_navbar

checkable pan/zoom buttons for QT NavigationToolbar
Resolves #1246 exception. Agg backend works beautifully, PDF and SVG fail to produce suitable results.
Merge remote-tracking branch 'upstream/v1.2.x'
Use a DOI link
Properly passing on horiz-/vertOn to Cursor()

Simple fix to properly pass on the horizOn and vertOn keyword
arguments to the matplotlib.widgets.Cursor constructor.
Fix test_pickle test.  Remove lots of the text to make the comparison easier, and also update for a recent fix to the legend.
Merge pull request #1255 from mdboom/fix-tests

Fix test_pickle test.
Fix BoundaryNorm interpolation with numpy 1.7rc.

Closes github issue #1258.
Update six.py to version 1.2
Fixes #1246. Repeated drawing handling fixed by correcting the affine/non-affine transformation of a BlendedGenericTransform.