Make pyplot.bar color kwarg less ambiguous
fix the docstring for scale_docs to only strip whitespace at the end (the whitespace at the beginning is needed for alignment)
BF: guard against broken PyQt import

We may have picked up a broken PyQt that correctly imported, for example
if we have imported a Python 3.3 PyQt from Python 3.2; check we do have
the attribute we need for getting PyQt versions.
except AttributeError in module gi during checking for gtk3 backends
Remove disabled code.
Merge pull request #2308 from dmcdougall/v1.2.x

Make pyplot.bar color kwarg less ambiguous
Update pyplot_formatstr.py
Update pyplot_mathtext.py
Update pyplot_text.py
Update pyplot_three.py
Update pyplot_two_subplots.py
Fix #2338: pyparsing in 1.5.7's <<= operator doesn't return self, so we need to monkey patch it, too
Merge pull request #2344 from anshbansal/master

Fixed the issue of pyplot tutorial missing the show() command
Merge pull request #2344 from anshbansal/master

Fixed the issue of pyplot tutorial missing the show() command
Fix #2339: render math text when using path effects
Merge pull request #2334 from andreabedini/patch-4

Remove disabled code.
Merge pull request #2334 from andreabedini/patch-4

Remove disabled code.
Merge pull request #2338 from mdboom/mathtext-pyparsing157-crash

issues with pyparsing 1.5.7 and python 2.7
Merge remote-tracking branch 'upstream/v1.3.x'
Merge pull request #2340 from lpsinger/patheffects_math_text

Fix #2339: render math text when using path effects