Merge branch 'release/1.1' into develop

docs/conf.py

@@ -47,7 +47,7 @@ copyright = '2008-2011, The pip developers'
 # built documents.
 #
 # The short X.Y version.
-release = "1.0.2.post1"
+release = "1.1"
 version = '.'.join(release.split('.')[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation

docs/news.txt

@@ -5,13 +5,13 @@ News
 Changelog
 =========
 
-Next release (1.1) schedule
+Next release (1.2) schedule
 ---------------------------
 
-Beta and final releases planned for the first half of 2012.
+Beta and final releases planned for the second half of 2012.
 
-develop (unreleased)
---------------------
+1.1 (2012-02-16)
+----------------
 
 * Fixed issue #326 - don't crash when a package's setup.py emits UTF-8 and
   then fails. Thanks Marc Abramowitz.

setup.py

@@ -3,7 +3,7 @@ import os
 from setuptools import setup
 
 # If you change this version, change it also in docs/conf.py
-version = "1.0.2.post1"
+version = "1.1"
 
 doc_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), "docs")
 index_filename = os.path.join(doc_dir, "index.txt")