Merge branch 'hotfix/v0.11.2' into development

Conflicts:
	apps/documents/statistics.py
	docs/changelog.rst

README.md

@@ -3,7 +3,9 @@ Mayan
 
 Open source, Django based document manager with custom metadata indexing, file serving integration and OCR capabilities.
 
-[Website](http://bit.ly/mayan-edms)
+[Website](http://www.mayan-edms.com)
+
+[Mailing list (via Google Groups)](http://groups.google.com/group/mayan-edms)
 
 [Video demostration](http://bit.ly/pADNXv)
 

apps/documents/statistics.py

@@ -1,12 +1,11 @@
-from __future__ import absolute_import
-
 from django.utils.translation import ugettext_lazy as _
 from django.db.models import Avg, Count, Min, Max
 
 from common.utils import pretty_size, pretty_size_10
 
-from .conf.settings import STORAGE_BACKEND
+from documents.conf.settings import STORAGE_BACKEND
-from .models import Document, DocumentType, DocumentPage, DocumentVersion
+from documents.models import Document, DocumentType, DocumentPage, DocumentVersion
+from django.db.models import Avg, Count, Min, Max
 
 
 def get_used_size(path, file_list):

apps/main/__init__.py

@@ -21,7 +21,7 @@ __status__ = 'Production'
 __version_info__ = {
     'major': 0,
     'minor': 11,
-    'micro': 1,
+    'micro': 2,
     'releaselevel': 'final',
     'serial': 0
 }

requirements/production.txt

@@ -16,3 +16,4 @@ djangorestframework==0.2.3
 South==0.7.3
 python-gnupg==0.2.8
 python-hkp==0.1.3
+kombu==1.4.2