Bumped to 1.1.6 in preparation for next release.

4 files changed, 44 insertions, 44 deletions

diff --git a/ez_setup.py b/ez_setup.py
index 4118de3b..b02f3f17 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@ try:
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.5"
+DEFAULT_VERSION = "1.1.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 139acb1d..4acc9af4 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [distutils.commands]
+alias = setuptools.command.alias:alias
+build_ext = setuptools.command.build_ext:build_ext
+test = setuptools.command.test:test
 rotate = setuptools.command.rotate:rotate
-build_py = setuptools.command.build_py:build_py
-sdist = setuptools.command.sdist:sdist
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-register = setuptools.command.register:register
-saveopts = setuptools.command.saveopts:saveopts
 install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
+saveopts = setuptools.command.saveopts:saveopts
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-easy_install = setuptools.command.easy_install:easy_install
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 egg_info = setuptools.command.egg_info:egg_info
-setopt = setuptools.command.setopt:setopt
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_lib = setuptools.command.install_lib:install_lib
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-test = setuptools.command.test:test
-build_ext = setuptools.command.build_ext:build_ext
+upload_docs = setuptools.command.upload_docs:upload_docs
+easy_install = setuptools.command.easy_install:easy_install
+install = setuptools.command.install:install
+register = setuptools.command.register:register
 develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
+build_py = setuptools.command.build_py:build_py
+setopt = setuptools.command.setopt:setopt
+sdist = setuptools.command.sdist:sdist
 
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+namespace_packages = setuptools.dist:check_nsp
+use_2to3 = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
 entry_points = setuptools.dist:check_entry_points
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 package_data = setuptools.dist:check_package_data
-use_2to3_fixers = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
-test_suite = setuptools.dist:check_test_suite
 test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-include_package_data = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
 dependency_links = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
 packages = setuptools.dist:check_packages
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+convert_2to3_doctests = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
 
 [egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 entry_points.txt = setuptools.command.egg_info:write_entries
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 256342f0..e8e2105d 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,5 +1,8 @@
 
 
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
@@ -7,7 +10,4 @@ wincertstore==0.1
 certifi==0.0.8
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 99d2a6fa..6ebd335c 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.5'
+__version__ = '1.1.6'