matplotlib Code

Fixed a typo, an elif was placed after the else part of an 'if' statement.

Merged revisions 6752,6754 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint

........
r6752 | efiring | 2009-01-06 14:56:03 -0500 (Tue, 06 Jan 2009) | 2 lines

Backport 6745, 6746 from trunk
........
r6754 | mdboom | 2009-01-06 15:51:53 -0500 (Tue, 06 Jan 2009) | 1 line

Update git instructions with information about working on branches.
........

Update git instructions with information about working on branches.

Minor code cleanup in contour

Backport 6745, 6746 from trunk

Fix reST formatting in list of hatch patterns.

Make gen_rst.py quieter

Fix stix_font_demo.py

Fix reST formatting.

Remove examples as a stage in make.py, since it is now integrated into the build as an event-triggered plugin.