merge v1.1.x into master

jdh2358 · jdh2358 · commit 404a8d82c67e · 2011-10-06T10:01:09.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -99,7 +99,7 @@
 """
 from __future__ import generators
 
-__version__  = '1.1.0'
+__version__  = '1.1.x'
 
 import os, re, shutil, subprocess, sys, warnings
 import distutils.sysconfig
