Merge branch 'hotfix/v0.11.2' into development

Conflicts: apps/documents/statistics.py docs/changelog.rst
2012-02-02 05:23:17 -04:00
parent 1c8fd9e212 c117a907e4
commit f8e2341f4f
5 changed files with 724 additions and 6 deletions
--- a/apps/main/init.py
+++ b/apps/main/init.py
@@ -21,7 +21,7 @@ __status__ = 'Production'
 __version_info__ = {
    'major': 0,
    'minor': 11,
-    'micro': 1,
+    'micro': 2,
    'releaselevel': 'final',
    'serial': 0
 }