Merge remote branch 'main/master'

Conflicts:
	lib/matplotlib/backends/backend_qt4.py
	lib/matplotlib/cbook.py
	lib/matplotlib/font_manager.py
	unit/__init__.py

Author: mdboom

.gitignore

@@ -40,3 +40,9 @@ Thumbs.db
 ###################################
 lib/matplotlib/mpl-data/matplotlib.conf
 lib/matplotlib/mpl-data/matplotlibrc
+
+# Documentation generated files #
+#################################
+doc/examples
+doc/_templates/gallery.html
+doc/_static/matplotlibrc

CHANGELOG

@@ -1,3 +1,8 @@
+2011-03-29 Wrapped ViewVCCachedServer definition in a factory function.
+           This class now inherits from urllib2.HTTPSHandler in order
+           to fetch data from github, but HTTPSHandler is not defined
+           if python was built without SSL support. - DSD
+
 2011-03-10 Update pytz version to 2011c, thanks to Simon Cross. - JKS
 
 2011-03-06 Add standalone tests.py test runner script. - JKS