Merge branch 'hotfix/v0.10-hf1' into development

Conflicts:
	apps/main/__init__.py
	docs/changelog.rst

apps/main/__init__.py

@@ -18,13 +18,12 @@ __status__ = 'Production'
 
 __version_info__ = {
     'major': 0,
-    'minor': 11,
-    'micro': 0,
-    'releaselevel': 'beta',
-    'serial': 3
+    'minor': 10,
+    'micro': 1,
+    'releaselevel': 'final',
+    'serial': 0
 }
 
-
 def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 

docs/changelog.rst

@@ -34,6 +34,15 @@
 * Removed extra slash in ajax-loader.gif URL fixes #15, thanks to IHLeanne for finding this one
 
 
+Version 0.10.1
+--------------
+* Upgraded django-compressor to version 1.1.1, run::
+
+  $ pip install --upgrade -r requirements/production.txt
+
+  to upgrade
+
+
 Version 0.10
 ------------
 * Added a proper setup views for the document grouping functionality.

docs/conf.py

@@ -48,7 +48,7 @@ copyright = u'2011, Roberto Rosario'
 # built documents.
 #
 # The short X.Y version.
-version = '0.10'
+version = '0.10.1'
 
 # The full version, including alpha/beta/rc tags.
 release = '0.10'

requirements/development.txt

@@ -16,7 +16,7 @@ pdfminer==20110227
 APScheduler==2.0.2
 Pillow==1.7.4
 cssmin==0.1.4
-django-compressor==1.1
+django-compressor==1.1.1
 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
 djangorestframework==0.2.3
 South==0.7.3

requirements/production.txt

@@ -13,7 +13,7 @@ pdfminer==20110227
 APScheduler==2.0.2
 Pillow==1.7.4
 cssmin==0.1.4
-django-compressor==1.1
+django-compressor==1.1.1
 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
 djangorestframework==0.2.3
 South==0.7.3