Merge branch 'hotfix/1.1.2' into develop

Conflicts:
	docs/changelog.txt

compressor/__init__.py

@@ -1,2 +1,2 @@
 # following PEP 386, versiontools will pick it up
-__version__ = (1, 1, 1, "final", 0)
+__version__ = (1, 1, 2, "final", 0)

docs/changelog.txt

@@ -49,6 +49,11 @@ v1.2.0 (in development)
   from ``'hash'`` to ``'content'`` to better describe what it does. The old
   name is also supported, as well as the default being ``'mtime'``.
 
+v1.1.2
+------
+
+- Fixed an installation issue related to versiontools.
+
 v1.1.1
 ------
 

docs/conf.py

@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Django Compressor'
-copyright = u'2011, Django Compressor authors'
+copyright = u'2012, Django Compressor authors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -50,7 +50,7 @@ copyright = u'2011, Django Compressor authors'
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -125,6 +125,6 @@ setup(
         'django-appconf >= 0.4',
     ],
     setup_requires = [
-        'versiontools >= 1.6',
+        'versiontools >= 1.8.2',
     ],
 )