Merge branch 'hotfix/v0.11.2' into development

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

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 .models import Document, DocumentType, DocumentPage, DocumentVersion
+from documents.conf.settings import STORAGE_BACKEND
+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
 }