Merge branch '1.9.X' into develop

Conflicts:
	docs/conf.py
	virtualenv.py

5 files changed, 14 insertions, 6 deletions

diff --git a/LICENSE.txt b/LICENSE.txt
index 0d82cc9..23c5387 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 Copyright (c) 2007 Ian Bicking and Contributors
 Copyright (c) 2009 Ian Bicking, The Open Planning Project
-Copyright (c) 2011-2012 The virtualenv developers
+Copyright (c) 2011-2013 The virtualenv developers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/docs/conf.py b/docs/conf.py
index 462a84a..651421b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -11,10 +11,11 @@
 # All configuration values have a default value; values that are commented out
 # serve to show the default value.
 
+import os
 import sys
 
 # If your extensions are in another directory, add it here.
-#sys.path.append('some/directory')
+sys.path.insert(0, os.path.abspath(os.pardir))
 
 # General configuration
 # ---------------------
@@ -39,7 +40,14 @@ copyright = '2007-2013, Ian Bicking, The Open Planning Project, The virtualenv d
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
-version = release = '1.10.dev1' #set explicity due to RTD sys.path issues
+try:
+    from virtualenv import __version__
+    # The short X.Y version.
+    version = '.'.join(__version__.split('.')[:2])
+    # The full version, including alpha/beta/rc tags.
+    release = __version__
+except ImportError:
+    version = release = 'dev'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/virtualenv.py b/virtualenv.py
index 17a90dc..700043e 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -2290,9 +2290,9 @@ r7VNubWkndkXaxg5GO3UaOOKS6drO3luDDiO5my3iA0YAKGzPRV1ack8cOdhysI0CYzIPzjSiH5X
 
 ##file deactivate.bat
 DEACTIVATE_BAT = convert("""
-eJxzSE3OyFfIT0vj4spMU0hJTcvMS01RiPf3cYkP8wwKCXX0iQ8I8vcNCFHQ4FIAguLUEgUliIit
-KhZlqkpcnCA1WKRsuTTxWBIZ4uHv5+Hv64piEVwU3TK4BNBCmHIcKvDb6xjigWIjkI9uF1AIu7dA
-akGGW7n6uXABALCXXUI=
+eJxzSE3OyFfIT0vj4ipOLVEI8wwKCXX0iXf1C7Pl4spMU0hJTcvMS01RiPf3cYmHyQYE+fsGhCho
+cCkAAUibEkTEVhWLMlUlLk6QGixStlyaeCyJDPHw9/Pw93VFsQguim4ZXAJoIUw5DhX47XUM8UCx
+EchHtwsohN1bILUgw61c/Vy4AJYPYm4=
 """)
 
 ##file activate.ps1
diff --git a/virtualenv_support/pip-1.3.tar.gz b/virtualenv_support/pip-1.3.tar.gz
new file mode 100644
index 0000000..31fe850
--- /dev/null
+++ b/virtualenv_support/pip-1.3.tar.gz
diff --git a/virtualenv_support/pip-1.3rc2.tar.gz b/virtualenv_support/pip-1.3rc2.tar.gz
deleted file mode 100644
index 0708c48..0000000
--- a/virtualenv_support/pip-1.3rc2.tar.gz
+++ /dev/null