Merge branch 'master' into develop

Conflicts: virtualenv.py
pypa · Feb 21, 2014 · 9faa0be · 9faa0be
2 parents d55e613 + 6dc9b1d
commit 9faa0be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/docs/news.rst b/docs/news.rst
@@ -15,6 +15,12 @@ Changes & News
    with the upgraded Python.
 
 
+1.11.4 (2014-02-21)
+~~~~~~~~~~~~~~~~~~~
+
+* Updated pip to 1.5.4
+
+
 1.11.3 (2014-02-20)
 ~~~~~~~~~~~~~~~~~~~
 

diff --git a/...nv_support/pip-1.5.3-py2.py3-none-any.whl → ...nv_support/pip-1.5.4-py2.py3-none-any.whl b/...nv_support/pip-1.5.3-py2.py3-none-any.whl → ...nv_support/pip-1.5.4-py2.py3-none-any.whl