Merge branch 'master' into pipeline-next

Conflicts:
	.travis.yml
	pipeline/compilers/__init__.py
	pipeline/compressors/__init__.py
	pipeline/jinja2/ext.py
	pipeline/storage.py
	pipeline/templatetags/compressed.py

.travis.yml

 language: python
 python:
   - 2.7
-install: pip install tox --use-mirrors
+install: pip install -q --use-mirrors tox
 script: tox
 notifications:
   irc: "irc.freenode.org#django-pipeline"
\ No newline at end of file

HISTORY.rst

@@ -3,6 +3,20 @@
 History
 =======
 
+
+1.1.22
+------
+
+* Better compressor error messages. Thanks to Steven Cummings.
+* Improve installation documentation. Thanks to Steven Cummings.
+* Fix packaging metadata. Thanks to Rui Coelho for noticing it.
+* Add documentation about non-packing storage.
+
+1.1.21
+------
+
+* Run stylus even if file is considered outdated.
+
 1.1.20
 ------
 

docs/conf.py

@@ -51,7 +51,7 @@ copyright = u'2011-2012, Timothée Peignier'
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.21'
+release = '1.2.22'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pipeline/middleware.py

@@ -6,7 +6,7 @@ from django.utils.html import strip_spaces_between_tags as minify_html
 
 class MinifyHTMLMiddleware(object):
     def process_response(self, request, response):
-        if 'text/html' in response['Content-Type']:
+        if response.has_header('Content-Type') and 'text/html' in response['Content-Type']:
             try:
                 response.content = minify_html(response.content.strip())
             except DjangoUnicodeDecodeError:

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-pipeline',
-    version='1.2.21',
+    version='1.2.22',
     description='Pipeline is an asset packaging library for Django.',
     long_description=open('README.rst').read() + '\n\n' +
         open('HISTORY.rst').read(),