Merge branch 'master' into develop

Conflicts: CHANGES.txt pip/__init__.py
msabramo · Jan 3, 2015 · aadfdef · aadfdef
2 parents ea600b2 + 3dbe2da
commit aadfdef
Show file tree

Hide file tree

Showing 2 changed files with 864 additions and 856 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,12 @@
   otherwise fallback to the original ASCII based progress bar.
 
 
+**6.0.5 (2015-01-03)**
+
+* Fix a regression with 6.0.4 under Windows where most commands would raise an
+  exception due to Windows not having the ``os.geteuid()`` function.
+
+
 **6.0.4 (2015-01-03)**
 
 * Fix an issue where ANSI escape codes would be used on Windows even though the