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

Conflicts: apps/main/__init__.py docs/changelog.rst
2011-12-05 14:46:17 -04:00
parent 1a973723f2 52a8fca5d9
commit 623fa8276f
5 changed files with 16 additions and 8 deletions
--- a/apps/main/init.py
+++ b/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